opcua-webapi-ts 1.1.27 → 1.1.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dist/cjs/client/utils/UaModelling.js +2 -2
  2. package/dist/cjs/client/utils/UaNodeBrowser.js +5 -4
  3. package/dist/cjs/client/utils/UaNodeReader.js +2 -2
  4. package/dist/client/utils/UaModelling.js +2 -2
  5. package/dist/client/utils/UaNodeBrowser.d.ts +2 -1
  6. package/dist/client/utils/UaNodeBrowser.js +5 -4
  7. package/dist/client/utils/UaNodeReader.js +2 -2
  8. package/package.json +1 -1
package/dist/cjs/client/utils/UaModelling.js CHANGED
@@ -98,7 +98,7 @@ class UaModelling {
98
98
  return null;
99
99
  if (objectType.isObjectMemberRead)
100
100
  return objectType;
101
- let typeMemberBrowser = new __1.UaNodeBrowser(this._client, [objectType.nodeId], common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), opcua_webapi_1.NodeClass.Object);
101
+ let typeMemberBrowser = new __1.UaNodeBrowser(this._client, [objectType.nodeId], common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), true, opcua_webapi_1.NodeClass.Object);
102
102
  yield typeMemberBrowser.browse();
103
103
  let browseMemberResults = typeMemberBrowser.results();
104
104
  let instanceNodes = new Map();
@@ -113,7 +113,7 @@ class UaModelling {
113
113
  for (let node of instanceNodes) {
114
114
  memberObjectIds.push(node[1].nodeId);
115
115
  }
116
- let modellingRuleBrowser = new __1.UaNodeBrowser(this._client, memberObjectIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HasModellingRule), opcua_webapi_1.NodeClass.Object);
116
+ let modellingRuleBrowser = new __1.UaNodeBrowser(this._client, memberObjectIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HasModellingRule), false, opcua_webapi_1.NodeClass.Object);
117
117
  yield modellingRuleBrowser.browse();
118
118
  let browseModellingRuleResults = modellingRuleBrowser.results();
119
119
  for (let item of browseModellingRuleResults) {
package/dist/cjs/client/utils/UaNodeBrowser.js CHANGED
@@ -13,10 +13,11 @@ exports.UaTypeBrowser = exports.UaObjectBrowser = exports.UaNodeBrowser = void 0
13
13
  const opcua_webapi_1 = require("opcua-webapi");
14
14
  const common_1 = require("../../common");
15
15
  class UaNodeBrowser {
16
- constructor(client, nodeIds, referenceType, nodeClassToReturn, maxNodesPerBrowse, maxReferencesPerNode) {
16
+ constructor(client, nodeIds, referenceType, includeSubtypes, nodeClassToReturn, maxNodesPerBrowse, maxReferencesPerNode) {
17
17
  this._client = client;
18
18
  this._nodesToBrowse = [];
19
19
  this._referenceType = referenceType;
20
+ this._includeSubtypes = includeSubtypes;
20
21
  this._nodeClassToReturn = nodeClassToReturn;
21
22
  this._continuationPointToBrowse = [];
22
23
  this._maxNodesPerBrowse = (null == maxNodesPerBrowse || maxNodesPerBrowse <= 0) ? 50 : maxNodesPerBrowse;
@@ -70,7 +71,7 @@ class UaNodeBrowser {
70
71
  let nodesToBrowse = this._nodesToBrowse.splice(0, this._maxNodesPerBrowse);
71
72
  let browseDescriptions = [];
72
73
  for (let item of nodesToBrowse) {
73
- let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Forward, this._referenceType, true, this._nodeClassToReturn, 63);
74
+ let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Forward, this._referenceType, this._includeSubtypes, this._nodeClassToReturn, 63);
74
75
  browseDescriptions.push(browseDescription);
75
76
  }
76
77
  let results = yield this._client.browse(browseDescriptions, this._maxReferencesPerNode);
@@ -145,13 +146,13 @@ class UaNodeBrowser {
145
146
  exports.UaNodeBrowser = UaNodeBrowser;
146
147
  class UaObjectBrowser extends UaNodeBrowser {
147
148
  constructor(client, nodeIds, referenceType = common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences)) {
148
- super(client, nodeIds, referenceType, opcua_webapi_1.NodeClass.Object, 20);
149
+ super(client, nodeIds, referenceType, true, opcua_webapi_1.NodeClass.Object, 20);
149
150
  }
150
151
  }
151
152
  exports.UaObjectBrowser = UaObjectBrowser;
152
153
  class UaTypeBrowser extends UaNodeBrowser {
153
154
  constructor(client, nodeIds) {
154
- 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);
155
+ 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);
155
156
  }
156
157
  }
157
158
  exports.UaTypeBrowser = UaTypeBrowser;
package/dist/cjs/client/utils/UaNodeReader.js CHANGED
@@ -70,7 +70,7 @@ class UaNodeReader {
70
70
  nodeIdsToBrowse.push(item.nodeId);
71
71
  nodeIdsSet.add(item.nodeId.toString());
72
72
  }
73
- let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, this._referenceTypeToReturn, this._nodeClassToReturn);
73
+ let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, this._referenceTypeToReturn, true, this._nodeClassToReturn);
74
74
  yield nodeReferenceBrowser.browse();
75
75
  let childReferences = nodeReferenceBrowser.results();
76
76
  let childNodesToBrowse = [];
@@ -87,7 +87,7 @@ class UaNodeReader {
87
87
  }
88
88
  let variableReferences = [];
89
89
  if (childNodesToBrowse.length != 0) {
90
- let childReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, childNodesToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), opcua_webapi_1.NodeClass.Variable);
90
+ let childReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, childNodesToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), true, opcua_webapi_1.NodeClass.Variable);
91
91
  yield childReferenceBrowser.browse();
92
92
  variableReferences = childReferenceBrowser.results();
93
93
  }
package/dist/client/utils/UaModelling.js CHANGED
@@ -98,7 +98,7 @@ class UaModelling {
98
98
  return null;
99
99
  if (objectType.isObjectMemberRead)
100
100
  return objectType;
101
- let typeMemberBrowser = new __1.UaNodeBrowser(this._client, [objectType.nodeId], common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), opcua_webapi_1.NodeClass.Object);
101
+ let typeMemberBrowser = new __1.UaNodeBrowser(this._client, [objectType.nodeId], common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), true, opcua_webapi_1.NodeClass.Object);
102
102
  yield typeMemberBrowser.browse();
103
103
  let browseMemberResults = typeMemberBrowser.results();
104
104
  let instanceNodes = new Map();
@@ -113,7 +113,7 @@ class UaModelling {
113
113
  for (let node of instanceNodes) {
114
114
  memberObjectIds.push(node[1].nodeId);
115
115
  }
116
- let modellingRuleBrowser = new __1.UaNodeBrowser(this._client, memberObjectIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HasModellingRule), opcua_webapi_1.NodeClass.Object);
116
+ let modellingRuleBrowser = new __1.UaNodeBrowser(this._client, memberObjectIds, common_1.UaNodeId.from(common_1.ReferenceTypeIds.HasModellingRule), false, opcua_webapi_1.NodeClass.Object);
117
117
  yield modellingRuleBrowser.browse();
118
118
  let browseModellingRuleResults = modellingRuleBrowser.results();
119
119
  for (let item of browseModellingRuleResults) {
package/dist/client/utils/UaNodeBrowser.d.ts CHANGED
@@ -9,11 +9,12 @@ export declare class UaNodeBrowser {
9
9
  private _nodesToBrowse;
10
10
  private _continuationPointToBrowse;
11
11
  private _referenceType;
12
+ private _includeSubtypes;
12
13
  private _nodeClassToReturn;
13
14
  private _maxNodesPerBrowse;
14
15
  private _maxReferencesPerNode;
15
16
  private _readResults;
16
- constructor(client: UaWebClient, nodeIds: Array<UaNodeId>, referenceType: UaNodeId, nodeClassToReturn: number, maxNodesPerBrowse?: number | null, maxReferencesPerNode?: number | null);
17
+ constructor(client: UaWebClient, nodeIds: Array<UaNodeId>, referenceType: UaNodeId, includeSubtypes: boolean, nodeClassToReturn: number, maxNodesPerBrowse?: number | null, maxReferencesPerNode?: number | null);
17
18
  browse(): Promise<void>;
18
19
  browseOnce(): Promise<void>;
19
20
  results(): Array<BrowseReferenceResult>;
package/dist/client/utils/UaNodeBrowser.js CHANGED
@@ -13,10 +13,11 @@ exports.UaTypeBrowser = exports.UaObjectBrowser = exports.UaNodeBrowser = void 0
13
13
  const opcua_webapi_1 = require("opcua-webapi");
14
14
  const common_1 = require("../../common");
15
15
  class UaNodeBrowser {
16
- constructor(client, nodeIds, referenceType, nodeClassToReturn, maxNodesPerBrowse, maxReferencesPerNode) {
16
+ constructor(client, nodeIds, referenceType, includeSubtypes, nodeClassToReturn, maxNodesPerBrowse, maxReferencesPerNode) {
17
17
  this._client = client;
18
18
  this._nodesToBrowse = [];
19
19
  this._referenceType = referenceType;
20
+ this._includeSubtypes = includeSubtypes;
20
21
  this._nodeClassToReturn = nodeClassToReturn;
21
22
  this._continuationPointToBrowse = [];
22
23
  this._maxNodesPerBrowse = (null == maxNodesPerBrowse || maxNodesPerBrowse <= 0) ? 50 : maxNodesPerBrowse;
@@ -70,7 +71,7 @@ class UaNodeBrowser {
70
71
  let nodesToBrowse = this._nodesToBrowse.splice(0, this._maxNodesPerBrowse);
71
72
  let browseDescriptions = [];
72
73
  for (let item of nodesToBrowse) {
73
- let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Forward, this._referenceType, true, this._nodeClassToReturn, 63);
74
+ let browseDescription = new common_1.UaBrowseDescription(item, opcua_webapi_1.BrowseDirection.Forward, this._referenceType, this._includeSubtypes, this._nodeClassToReturn, 63);
74
75
  browseDescriptions.push(browseDescription);
75
76
  }
76
77
  let results = yield this._client.browse(browseDescriptions, this._maxReferencesPerNode);
@@ -145,13 +146,13 @@ class UaNodeBrowser {
145
146
  exports.UaNodeBrowser = UaNodeBrowser;
146
147
  class UaObjectBrowser extends UaNodeBrowser {
147
148
  constructor(client, nodeIds, referenceType = common_1.UaNodeId.from(common_1.ReferenceTypeIds.HierarchicalReferences)) {
148
- super(client, nodeIds, referenceType, opcua_webapi_1.NodeClass.Object, 20);
149
+ super(client, nodeIds, referenceType, true, opcua_webapi_1.NodeClass.Object, 20);
149
150
  }
150
151
  }
151
152
  exports.UaObjectBrowser = UaObjectBrowser;
152
153
  class UaTypeBrowser extends UaNodeBrowser {
153
154
  constructor(client, nodeIds) {
154
- 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);
155
+ 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);
155
156
  }
156
157
  }
157
158
  exports.UaTypeBrowser = UaTypeBrowser;
package/dist/client/utils/UaNodeReader.js CHANGED
@@ -70,7 +70,7 @@ class UaNodeReader {
70
70
  nodeIdsToBrowse.push(item.nodeId);
71
71
  nodeIdsSet.add(item.nodeId.toString());
72
72
  }
73
- let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, this._referenceTypeToReturn, this._nodeClassToReturn);
73
+ let nodeReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, nodeIdsToBrowse, this._referenceTypeToReturn, true, this._nodeClassToReturn);
74
74
  yield nodeReferenceBrowser.browse();
75
75
  let childReferences = nodeReferenceBrowser.results();
76
76
  let childNodesToBrowse = [];
@@ -87,7 +87,7 @@ class UaNodeReader {
87
87
  }
88
88
  let variableReferences = [];
89
89
  if (childNodesToBrowse.length != 0) {
90
- let childReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, childNodesToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), opcua_webapi_1.NodeClass.Variable);
90
+ let childReferenceBrowser = new UaNodeBrowser_1.UaNodeBrowser(this._client, childNodesToBrowse, common_1.UaNodeId.from(common_1.ReferenceTypeIds.Aggregates), true, opcua_webapi_1.NodeClass.Variable);
91
91
  yield childReferenceBrowser.browse();
92
92
  variableReferences = childReferenceBrowser.results();
93
93
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "opcua-webapi-ts",
3
- "version": "1.1.27",
3
+ "version": "1.1.28",
4
4
  "description": "Provides OPC UA WebAPI wrapper and client based on opcua-webapi-typescript",
5
5
  "author": "DingYan",
6
6
  "license": "MIT",