node-opcua-server 2.81.0 → 2.82.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.
- package/dist/base_server.js +10 -1
- package/dist/base_server.js.map +1 -1
- package/dist/monitored_item.d.ts +2 -3
- package/dist/monitored_item.js +69 -32
- package/dist/monitored_item.js.map +1 -1
- package/dist/node_sampler.js +4 -0
- package/dist/node_sampler.js.map +1 -1
- package/dist/opcua_server.js.map +1 -1
- package/dist/server_engine.js +38 -21
- package/dist/server_engine.js.map +1 -1
- package/dist/server_subscription.js +5 -4
- package/dist/server_subscription.js.map +1 -1
- package/dist/validate_filter.js +26 -6
- package/dist/validate_filter.js.map +1 -1
- package/package.json +44 -44
- package/source/base_server.ts +15 -3
- package/source/monitored_item.ts +81 -44
- package/source/node_sampler.ts +6 -0
- package/source/opcua_server.ts +0 -1
- package/source/server_engine.ts +62 -27
- package/source/server_subscription.ts +11 -8
- package/source/validate_filter.ts +28 -10
|
@@ -7,28 +7,46 @@ import { BaseNode, UAVariable } from "node-opcua-address-space";
|
|
|
7
7
|
import { AttributeIds } from "node-opcua-data-model";
|
|
8
8
|
import { NodeClass } from "node-opcua-data-model";
|
|
9
9
|
import { ExtensionObject } from "node-opcua-extension-object";
|
|
10
|
-
import { NodeId } from "node-opcua-nodeid";
|
|
10
|
+
import { NodeId, NodeIdType } from "node-opcua-nodeid";
|
|
11
11
|
import { DataChangeFilter, EventFilter } from "node-opcua-service-filter";
|
|
12
12
|
import { DeadbandType } from "node-opcua-service-subscription";
|
|
13
13
|
import { StatusCode, StatusCodes } from "node-opcua-status-code";
|
|
14
14
|
import { ReadValueIdOptions } from "node-opcua-types";
|
|
15
|
+
import { DataType } from "node-opcua-basic-types";
|
|
16
|
+
|
|
17
|
+
function isNumberDataType(node: UAVariable): boolean {
|
|
18
|
+
if (node.dataType.namespace === 0 && node.dataType.identifierType === NodeIdType.NUMERIC && node.dataType.value < 22) {
|
|
19
|
+
switch (node.dataType.identifierType === NodeIdType.NUMERIC && node.dataType.value) {
|
|
20
|
+
case DataType.Float:
|
|
21
|
+
case DataType.Double:
|
|
22
|
+
case DataType.Byte:
|
|
23
|
+
case DataType.SByte:
|
|
24
|
+
case DataType.Int16:
|
|
25
|
+
case DataType.Int32:
|
|
26
|
+
case DataType.Int64:
|
|
27
|
+
case DataType.UInt16:
|
|
28
|
+
case DataType.UInt32:
|
|
29
|
+
case DataType.UInt64:
|
|
30
|
+
return true;
|
|
31
|
+
default:
|
|
32
|
+
return false;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
const dataType = node.addressSpace.findDataType(node.dataType)!;
|
|
36
|
+
const dataTypeNumber = node.addressSpace.findDataType("Number")!;
|
|
37
|
+
return dataType.isSupertypeOf(dataTypeNumber);
|
|
38
|
+
}
|
|
15
39
|
|
|
16
40
|
function __validateDataChangeFilter(filter: DataChangeFilter, itemToMonitor: ReadValueIdOptions, node: UAVariable): StatusCode {
|
|
17
41
|
assert(itemToMonitor.attributeId === AttributeIds.Value);
|
|
18
|
-
|
|
19
42
|
if (node.nodeClass !== NodeClass.Variable) {
|
|
20
43
|
return StatusCodes.BadNodeIdInvalid;
|
|
21
44
|
}
|
|
22
45
|
|
|
23
|
-
assert(node.nodeClass === NodeClass.Variable);
|
|
24
|
-
|
|
25
|
-
// if node is not Numerical=> DataChangeFilter
|
|
26
|
-
assert(node.dataType instanceof NodeId);
|
|
27
|
-
const dataType = node.addressSpace.findDataType(node.dataType)!;
|
|
28
|
-
|
|
29
|
-
const dataTypeNumber = node.addressSpace.findDataType("Number")!;
|
|
30
46
|
if (filter.deadbandType !== DeadbandType.None) {
|
|
31
|
-
if
|
|
47
|
+
// if node is not Numerical=> DataChangeFilter
|
|
48
|
+
assert(node.dataType instanceof NodeId);
|
|
49
|
+
if (!isNumberDataType(node)) {
|
|
32
50
|
return StatusCodes.BadFilterNotAllowed;
|
|
33
51
|
}
|
|
34
52
|
}
|