opcua-webapi-ts 1.1.18 → 1.1.19

package/dist/client/utils/UaNodeReader.js

@@ -9,181 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UaTypeReader = exports.UaObjectReader = exports.UaNodeReader = exports.UaSubtypeBrowser = exports.UaLinkBrowser = exports.UaChildBrowser = exports.UaNodeReferenceBrowser = void 0;
+exports.UaTypeReader = exports.UaObjectReader = exports.UaNodeReader = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
 const common_1 = require("../../common");
-class UaNodeReferenceBrowser {
-    constructor(client, nodeIds, referenceType, nodeClassToReturn, returnDescription, maxNodesPerBrowse, maxReferencesPerNode) {
-        this._client = client;
-        this._nodesToBrowse = [];
-        this._referenceType = referenceType;
-        this._nodeClassToReturn = nodeClassToReturn;
-        this._continuationPointToBrowse = [];
-        this._returnDescription = returnDescription !== null && returnDescription !== void 0 ? returnDescription : false;
-        this._maxNodesPerBrowse = (null == maxNodesPerBrowse || maxNodesPerBrowse <= 0) ? 50 : maxNodesPerBrowse;
-        this._maxReferencesPerNode = (null == maxReferencesPerNode || maxReferencesPerNode < 0) ? 50 : maxReferencesPerNode;
-        this._readResults = new Map();
-        if (this._nodeClassToReturn != 0) {
-            let nodeIdSet = new Set;
-            for (let item of nodeIds) {
-                if (nodeIdSet.has(item.toString()))
-                    continue;
-                nodeIdSet.add(item.toString());
-                this._nodesToBrowse.push(item);
-            }
-        }
-    }
-    browse() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isFinish())
-                return;
-            yield this.browseOnce();
-            yield this.browse();
-        });
-    }
-    browseOnce() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._continuationPointToBrowse.length != 0) {
-                yield this._browseContinuationPoints();
-            }
-            else if (this._nodesToBrowse.length != 0) {
-                yield this._browseNodes();
-            }
-        });
-    }
-    results() {
-        let results = [];
-        for (let item of this._readResults) {
-            results.push({
-                nodeId: (0, common_1.parseUaNodeId)(item[0]),
-                references: item[1]
-            });
-        }
-        this._readResults.clear();
-        return results;
-    }
-    isFinish() {
-        return (this._nodesToBrowse.length == 0) && (this._continuationPointToBrowse.length == 0);
-    }
-    _browseNodes() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            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);
-                browseDescriptions.push(browseDescription);
-            }
-            let results = yield this._client.browse(browseDescriptions, this._maxReferencesPerNode);
-            for (let i = 0; i < nodesToBrowse.length; ++i) {
-                let currentNodeId = nodesToBrowse[i];
-                let currentResult = results[i];
-                if (currentResult.statusCode.isNotGood())
-                    throw new common_1.UaError(currentResult.statusCode);
-                let currentReferences = this._readResults.get(currentNodeId.toString());
-                if (!currentReferences) {
-                    currentReferences = [];
-                    this._readResults.set(currentNodeId.toString(), currentReferences);
-                }
-                let newReferences = [];
-                for (let item of currentResult.references) {
-                    let nodeId = item.nodeId.getNodeId();
-                    let typeDefinition = (_a = item.typeDefinition) === null || _a === void 0 ? void 0 : _a.getNodeId();
-                    if (null == nodeId || null === typeDefinition)
-                        continue;
-                    let reference = new common_1.UaReference(nodeId, (item.nodeClass) ? item.nodeClass : opcua_webapi_1.NodeClass.Unspecified, item.browseName ? item.browseName : "", item.displayName ? item.displayName : common_1.UaLocalizedText.nullText, item.referenceTypeId ? item.referenceTypeId : common_1.UaNodeId.nullNodeId, (typeDefinition) ? typeDefinition : common_1.UaNodeId.nullNodeId);
-                    currentReferences.push(reference);
-                    newReferences.push(reference);
-                }
-                if (currentResult.continuationPoint) {
-                    this._continuationPointToBrowse.push({
-                        nodeId: currentNodeId,
-                        continuationPoint: currentResult.continuationPoint
-                    });
-                }
-                if (this._returnDescription)
-                    yield this._readDescriptions(newReferences);
-            }
-        });
-    }
-    _browseContinuationPoints() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            let cpsToBrowse = this._continuationPointToBrowse.splice(0, this._maxNodesPerBrowse);
-            let continuationPoints = [];
-            for (let item of cpsToBrowse) {
-                continuationPoints.push(item.continuationPoint);
-            }
-            let results = yield this._client.browseNext(continuationPoints, false);
-            for (let i = 0; i < cpsToBrowse.length; ++i) {
-                let currentNodeId = cpsToBrowse[i].nodeId;
-                let currentResult = results[i];
-                if (currentResult.statusCode.isNotGood())
-                    throw new common_1.UaError(currentResult.statusCode);
-                let newReferences = [];
-                for (let item of currentResult.references) {
-                    let nodeId = item.nodeId.getNodeId();
-                    let typeDefinition = (_a = item.typeDefinition) === null || _a === void 0 ? void 0 : _a.getNodeId();
-                    if (null == nodeId || null === typeDefinition)
-                        continue;
-                    let currentReferences = this._readResults.get(currentNodeId.toString());
-                    if (!currentReferences) {
-                        currentReferences = [];
-                        this._readResults.set(currentNodeId.toString(), currentReferences);
-                    }
-                    let reference = new common_1.UaReference(nodeId, (item.nodeClass) ? item.nodeClass : opcua_webapi_1.NodeClass.Unspecified, item.browseName ? item.browseName : "", item.displayName ? item.displayName : common_1.UaLocalizedText.nullText, item.referenceTypeId ? item.referenceTypeId : common_1.UaNodeId.nullNodeId, (typeDefinition) ? typeDefinition : common_1.UaNodeId.nullNodeId);
-                    currentReferences.push(reference);
-                    newReferences.push(reference);
-                }
-                if (currentResult.continuationPoint) {
-                    this._continuationPointToBrowse.push({
-                        nodeId: currentNodeId,
-                        continuationPoint: currentResult.continuationPoint
-                    });
-                }
-                if (this._returnDescription)
-                    yield this._readDescriptions(newReferences);
-            }
-        });
-    }
-    _readDescriptions(references) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (references.length === 0)
-                return;
-            let nodesToRead = [];
-            for (let item of references) {
-                nodesToRead.push(new common_1.UaReadValueId(item.nodeId, opcua_webapi_1.Attributes.Description));
-            }
-            let dataValues = yield this._client.read(nodesToRead);
-            for (let i = 0; i < references.length; ++i) {
-                if (dataValues[i].statusCode.isGood()) {
-                    let description = dataValues[i].value.toLocalizedText();
-                    if (description)
-                        references[i].description = description;
-                }
-            }
-        });
-    }
-}
-exports.UaNodeReferenceBrowser = UaNodeReferenceBrowser;
-class UaChildBrowser extends UaNodeReferenceBrowser {
-    constructor(client, nodeIds, returnDescription) {
-        super(client, nodeIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), opcua_webapi_1.NodeClass.Object, returnDescription !== null && returnDescription !== void 0 ? returnDescription : false, 20);
-    }
-}
-exports.UaChildBrowser = UaChildBrowser;
-class UaLinkBrowser extends UaNodeReferenceBrowser {
-    constructor(client, nodeIds, returnDescription) {
-        super(client, nodeIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.NonHierarchicalReferences), opcua_webapi_1.NodeClass.Object, returnDescription !== null && returnDescription !== void 0 ? returnDescription : false, 20);
-    }
-}
-exports.UaLinkBrowser = UaLinkBrowser;
-class UaSubtypeBrowser extends UaNodeReferenceBrowser {
-    constructor(client, nodeIds, returnDescription) {
-        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, returnDescription !== null && returnDescription !== void 0 ? returnDescription : false, 20);
-    }
-}
-exports.UaSubtypeBrowser = UaSubtypeBrowser;
+const UaNodeBrowser_1 = require("./UaNodeBrowser");
 class UaNodeReader {
     constructor(client, returnDescription, returnVariable, returnMethod, returnAttributes, returnValue) {
         this._client = client;
@@ -239,7 +68,7 @@ class UaNodeReader {
                 nodeIdsToBrowse.push(item.nodeId);
                 nodeIdsSet.add(item.nodeId.toString());
             }
-            let nodeReferenceBrowser = new UaNodeReferenceBrowser(this._client, nodeIdsToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), this._nodeClassToReturn, false);
+            let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), this._nodeClassToReturn, false);
             yield nodeReferenceBrowser.browse();
             let childReferences = nodeReferenceBrowser.results();
             let childNodesToBrowse = [];
@@ -256,7 +85,7 @@ class UaNodeReader {
             }
             let variableReferences = [];
             if (childNodesToBrowse.length != 0) {
-                let childReferenceBrowser = new UaNodeReferenceBrowser(this._client, childNodesToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), opcua_webapi_1.NodeClass.Variable, false);
+                let childReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, childNodesToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences), opcua_webapi_1.NodeClass.Variable, false);
                 yield childReferenceBrowser.browse();
                 variableReferences = childReferenceBrowser.results();
             }

package/dist/client/utils/UaObjectTypeDictionary.js

@@ -13,6 +13,7 @@ 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(client) {
         this._client = client;
@@ -22,7 +23,7 @@ class UaObjectTypeDictionary {
     }
     read() {
         return __awaiter(this, void 0, void 0, function* () {
-            let browser = new UaNodeReader_1.UaSubtypeBrowser(this._client, [common_1.UaNodeId.from(common_1.ObjectTypeIds.BaseObjectType)]);
+            let browser = new UaNodeBrowser_1.UaTypeBrowser(this._client, [common_1.UaNodeId.from(common_1.ObjectTypeIds.BaseObjectType)]);
             yield this._read(browser);
         });
     }
@@ -68,7 +69,7 @@ class UaObjectTypeDictionary {
                 return;
             yield this.__delay(20);
             // Continue to browse and read child type
-            let childBrowser = new UaNodeReader_1.UaSubtypeBrowser(this._client, nodeIdsToBrowse);
+            let childBrowser = new UaNodeBrowser_1.UaTypeBrowser(this._client, nodeIdsToBrowse);
             yield this._read(childBrowser);
         });
     }

package/dist/client/utils/UaReferenceTypeDictionary.js

@@ -13,6 +13,7 @@ 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(client) {
         this._client = client;
@@ -22,7 +23,7 @@ class UaReferenceTypeDictionary {
     }
     read() {
         return __awaiter(this, void 0, void 0, function* () {
-            let browser = new UaNodeReader_1.UaChildBrowser(this._client, [common_1.UaNodeId.from(common_1.ReferenceTypeIds.References)]);
+            let browser = new UaNodeBrowser_1.UaTypeBrowser(this._client, [common_1.UaNodeId.from(common_1.ReferenceTypeIds.References)]);
             yield this._read(browser);
         });
     }
@@ -68,7 +69,7 @@ class UaReferenceTypeDictionary {
                 return;
             yield this.__delay(20);
             // Continue to browse and read child type
-            let childBrowser = new UaNodeReader_1.UaChildBrowser(this._client, nodeIdsToBrowse);
+            let childBrowser = new UaNodeBrowser_1.UaTypeBrowser(this._client, nodeIdsToBrowse);
             yield this._read(childBrowser);
         });
     }

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opcua-webapi-ts",
-  "version": "1.1.18",
+  "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",