node-opcua-service-filter 2.85.0 → 2.86.0
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.
|
@@ -9,7 +9,7 @@ export declare function ofType(nodeId: NodeIdLike): ContentFilterElement;
|
|
|
9
9
|
export declare function l(dataType: DataType, value: any): LiteralOperand;
|
|
10
10
|
export declare function n(n: NodeIdLike): LiteralOperand;
|
|
11
11
|
export declare function s(attributeId: AttributeIds, path: string): SimpleAttributeOperand;
|
|
12
|
-
|
|
12
|
+
type A = LiteralOperand | SimpleAttributeOperand | AttributeOperand | ContentFilterElement;
|
|
13
13
|
export declare function or(a: A, b: A): ContentFilterElement;
|
|
14
14
|
export declare function and(a: A, b: A): ContentFilterElement;
|
|
15
15
|
export declare function lessThan(a: A, b: A): ContentFilterElement;
|
|
@@ -4,7 +4,6 @@ exports.FilterContextOnAddressSpace = void 0;
|
|
|
4
4
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
5
5
|
const node_opcua_debug_1 = require("node-opcua-debug");
|
|
6
6
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
7
|
-
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
8
7
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
9
8
|
const warningLog = (0, node_opcua_debug_1.make_warningLog)("Filter");
|
|
10
9
|
class FilterContextOnAddressSpace {
|
|
@@ -81,7 +80,7 @@ class FilterContextOnAddressSpace {
|
|
|
81
80
|
if ((0, node_opcua_nodeid_1.sameNodeId)(browsePath.startingNode, this.eventSource)) {
|
|
82
81
|
const browseResult = this.eventData._browse(browsePath);
|
|
83
82
|
if (browseResult &&
|
|
84
|
-
browseResult.statusCode
|
|
83
|
+
browseResult.statusCode.isGood() &&
|
|
85
84
|
browseResult.targets &&
|
|
86
85
|
browseResult.targets.length === 1) {
|
|
87
86
|
return browseResult.targets[0].targetId;
|
|
@@ -90,7 +89,7 @@ class FilterContextOnAddressSpace {
|
|
|
90
89
|
// fallback to addressSpace otherwise
|
|
91
90
|
const addressSpace = this.getAddressSpace();
|
|
92
91
|
const browseResult = addressSpace.browsePath(browsePath);
|
|
93
|
-
if (browseResult.statusCode
|
|
92
|
+
if (browseResult.statusCode.isNotGood() || !browseResult.targets || browseResult.targets.length !== 1) {
|
|
94
93
|
return null;
|
|
95
94
|
}
|
|
96
95
|
return browseResult.targets[0].targetId;
|
|
@@ -101,7 +100,7 @@ class FilterContextOnAddressSpace {
|
|
|
101
100
|
}
|
|
102
101
|
exports.FilterContextOnAddressSpace = FilterContextOnAddressSpace;
|
|
103
102
|
function prepare(dataValue) {
|
|
104
|
-
if (dataValue.statusCode
|
|
103
|
+
if (dataValue.statusCode.isGood()) {
|
|
105
104
|
return dataValue.value;
|
|
106
105
|
}
|
|
107
106
|
return new node_opcua_variant_1.Variant({ dataType: node_opcua_variant_1.DataType.StatusCode, value: dataValue.statusCode });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter_context_on_address_space.js","sourceRoot":"","sources":["../../source/on_address_space/filter_context_on_address_space.ts"],"names":[],"mappings":";;;AAYA,iEAAgE;AAChE,uDAAmD;AACnD,yDAAiF;
|
|
1
|
+
{"version":3,"file":"filter_context_on_address_space.js","sourceRoot":"","sources":["../../source/on_address_space/filter_context_on_address_space.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-service-filter",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.86.0",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module -service-filter",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -10,23 +10,23 @@
|
|
|
10
10
|
"build": "tsc -b"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"node-opcua-address-space-base": "2.
|
|
13
|
+
"node-opcua-address-space-base": "2.86.0",
|
|
14
14
|
"node-opcua-assert": "2.77.0",
|
|
15
|
-
"node-opcua-basic-types": "2.
|
|
15
|
+
"node-opcua-basic-types": "2.86.0",
|
|
16
16
|
"node-opcua-constants": "2.77.0",
|
|
17
|
-
"node-opcua-data-model": "2.
|
|
18
|
-
"node-opcua-data-value": "2.
|
|
19
|
-
"node-opcua-debug": "2.
|
|
20
|
-
"node-opcua-extension-object": "2.
|
|
21
|
-
"node-opcua-nodeid": "2.
|
|
22
|
-
"node-opcua-service-translate-browse-path": "2.
|
|
23
|
-
"node-opcua-status-code": "2.
|
|
24
|
-
"node-opcua-types": "2.
|
|
25
|
-
"node-opcua-variant": "2.
|
|
17
|
+
"node-opcua-data-model": "2.86.0",
|
|
18
|
+
"node-opcua-data-value": "2.86.0",
|
|
19
|
+
"node-opcua-debug": "2.86.0",
|
|
20
|
+
"node-opcua-extension-object": "2.86.0",
|
|
21
|
+
"node-opcua-nodeid": "2.86.0",
|
|
22
|
+
"node-opcua-service-translate-browse-path": "2.86.0",
|
|
23
|
+
"node-opcua-status-code": "2.86.0",
|
|
24
|
+
"node-opcua-types": "2.86.0",
|
|
25
|
+
"node-opcua-variant": "2.86.0"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"node-opcua-numeric-range": "2.
|
|
29
|
-
"node-opcua-packet-analyzer": "2.
|
|
28
|
+
"node-opcua-numeric-range": "2.86.0",
|
|
29
|
+
"node-opcua-packet-analyzer": "2.86.0",
|
|
30
30
|
"should": "^13.2.3"
|
|
31
31
|
},
|
|
32
32
|
"author": "Etienne Rossignon",
|
|
@@ -44,5 +44,5 @@
|
|
|
44
44
|
"internet of things"
|
|
45
45
|
],
|
|
46
46
|
"homepage": "http://node-opcua.github.io/",
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "36afc46fe2c91aa5664a8c5418f4db5a354670c3"
|
|
48
48
|
}
|
|
@@ -104,7 +104,7 @@ export class FilterContextOnAddressSpace implements FilterContext {
|
|
|
104
104
|
const browseResult = this.eventData._browse(browsePath);
|
|
105
105
|
if (
|
|
106
106
|
browseResult &&
|
|
107
|
-
browseResult.statusCode
|
|
107
|
+
browseResult.statusCode.isGood() &&
|
|
108
108
|
browseResult.targets &&
|
|
109
109
|
browseResult.targets.length === 1
|
|
110
110
|
) {
|
|
@@ -115,7 +115,7 @@ export class FilterContextOnAddressSpace implements FilterContext {
|
|
|
115
115
|
// fallback to addressSpace otherwise
|
|
116
116
|
const addressSpace = this.getAddressSpace();
|
|
117
117
|
const browseResult = addressSpace.browsePath(browsePath);
|
|
118
|
-
if (browseResult.statusCode
|
|
118
|
+
if (browseResult.statusCode.isNotGood() || !browseResult.targets || browseResult.targets.length !== 1) {
|
|
119
119
|
return null;
|
|
120
120
|
}
|
|
121
121
|
return browseResult.targets[0].targetId;
|
|
@@ -127,7 +127,7 @@ export class FilterContextOnAddressSpace implements FilterContext {
|
|
|
127
127
|
}
|
|
128
128
|
|
|
129
129
|
function prepare(dataValue: DataValue): Variant {
|
|
130
|
-
if (dataValue.statusCode
|
|
130
|
+
if (dataValue.statusCode.isGood()) {
|
|
131
131
|
return dataValue.value;
|
|
132
132
|
}
|
|
133
133
|
return new Variant({ dataType: DataType.StatusCode, value: dataValue.statusCode });
|