node-opcua-aggregates 2.54.0 → 2.57.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/.mocharc.yml +7 -7
- package/LICENSE +20 -20
- package/bin/sample_aggregate_server.js +14 -14
- package/dist/aggregates.js +2 -2
- package/dist/aggregates.js.map +1 -1
- package/dist/average.js +6 -5
- package/dist/average.js.map +1 -1
- package/dist/common.js +12 -2
- package/dist/common.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js.map +1 -1
- package/dist/interpolate.d.ts +1 -1
- package/dist/interpolate.js +8 -12
- package/dist/interpolate.js.map +1 -1
- package/dist/minmax.js +3 -2
- package/dist/minmax.js.map +1 -1
- package/dist/read_processed_details.d.ts +2 -2
- package/dist/read_processed_details.js +41 -38
- package/dist/read_processed_details.js.map +1 -1
- package/nyc.config.js +16 -16
- package/package.json +17 -15
- package/source/aggregates.ts +284 -277
- package/source/average.ts +71 -74
- package/source/common.ts +23 -10
- package/source/index.ts +11 -17
- package/source/interpolate.ts +14 -20
- package/source/interval.ts +3 -3
- package/source/minmax.ts +231 -231
- package/source/read_processed_details.ts +149 -139
- package/dist2/aggregates.d.ts +0 -7
- package/dist2/aggregates.js +0 -201
- package/dist2/aggregates.js.map +0 -1
- package/dist2/average.d.ts +0 -3
- package/dist2/average.js +0 -61
- package/dist2/average.js.map +0 -1
- package/dist2/common.d.ts +0 -8
- package/dist2/common.js +0 -89
- package/dist2/common.js.map +0 -1
- package/dist2/index.d.ts +0 -11
- package/dist2/index.js +0 -29
- package/dist2/index.js.map +0 -1
- package/dist2/interpolate.d.ts +0 -16
- package/dist2/interpolate.js +0 -135
- package/dist2/interpolate.js.map +0 -1
- package/dist2/interval.d.ts +0 -49
- package/dist2/interval.js +0 -165
- package/dist2/interval.js.map +0 -1
- package/dist2/minmax.d.ts +0 -18
- package/dist2/minmax.js +0 -149
- package/dist2/minmax.js.map +0 -1
- package/dist2/read_processed_details.d.ts +0 -6
- package/dist2/read_processed_details.js +0 -116
- package/dist2/read_processed_details.js.map +0 -1
package/.mocharc.yml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
require:
|
|
2
|
-
- ts-node/register
|
|
3
|
-
extension:
|
|
4
|
-
- ts
|
|
5
|
-
- js
|
|
6
|
-
recursive: true
|
|
7
|
-
timeout: 10000
|
|
1
|
+
require:
|
|
2
|
+
- ts-node/register
|
|
3
|
+
extension:
|
|
4
|
+
- ts
|
|
5
|
+
- js
|
|
6
|
+
recursive: true
|
|
7
|
+
timeout: 10000
|
package/LICENSE
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
The MIT License (MIT)
|
|
2
|
-
|
|
3
|
-
Copyright (c) 2014-2021 Etienne Rossignon
|
|
4
|
-
|
|
5
|
-
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
6
|
-
this software and associated documentation files (the "Software"), to deal in
|
|
7
|
-
the Software without restriction, including without limitation the rights to
|
|
8
|
-
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
|
9
|
-
the Software, and to permit persons to whom the Software is furnished to do so,
|
|
10
|
-
subject to the following conditions:
|
|
11
|
-
|
|
12
|
-
The above copyright notice and this permission notice shall be included in all
|
|
13
|
-
copies or substantial portions of the Software.
|
|
14
|
-
|
|
15
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
|
17
|
-
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
|
18
|
-
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
|
19
|
-
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
20
|
-
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
1
|
+
The MIT License (MIT)
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2014-2021 Etienne Rossignon
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
6
|
+
this software and associated documentation files (the "Software"), to deal in
|
|
7
|
+
the Software without restriction, including without limitation the rights to
|
|
8
|
+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
|
9
|
+
the Software, and to permit persons to whom the Software is furnished to do so,
|
|
10
|
+
subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
|
17
|
+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
|
18
|
+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
|
19
|
+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
20
|
+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
const opcua = require("node-opcua");
|
|
2
|
-
const path = require("path");
|
|
3
|
-
|
|
4
|
-
const server = new opcua.OPCUAServer({
|
|
5
|
-
});
|
|
6
|
-
|
|
7
|
-
const { addAggregateSupport } = require("..");
|
|
8
|
-
|
|
9
|
-
server.start(function(err){
|
|
10
|
-
|
|
11
|
-
addAggregateSupport(server.engine.addressSpace);
|
|
12
|
-
|
|
13
|
-
console.log("err= ",err);
|
|
14
|
-
|
|
1
|
+
const opcua = require("node-opcua");
|
|
2
|
+
const path = require("path");
|
|
3
|
+
|
|
4
|
+
const server = new opcua.OPCUAServer({
|
|
5
|
+
});
|
|
6
|
+
|
|
7
|
+
const { addAggregateSupport } = require("..");
|
|
8
|
+
|
|
9
|
+
server.start(function(err){
|
|
10
|
+
|
|
11
|
+
addAggregateSupport(server.engine.addressSpace);
|
|
12
|
+
|
|
13
|
+
console.log("err= ",err);
|
|
14
|
+
|
|
15
15
|
});
|
package/dist/aggregates.js
CHANGED
|
@@ -62,7 +62,7 @@ function setHistoricalServerCapabilities(historyServerCapabilities, defaultPrope
|
|
|
62
62
|
function setBoolean(propName) {
|
|
63
63
|
const lowerCase = utils.lowerFirstLetter(propName);
|
|
64
64
|
/* istanbul ignore next */
|
|
65
|
-
if (!
|
|
65
|
+
if (!Object.prototype.hasOwnProperty.call(defaultProperties, lowerCase)) {
|
|
66
66
|
throw new Error("cannot find " + lowerCase);
|
|
67
67
|
}
|
|
68
68
|
const value = defaultProperties[lowerCase];
|
|
@@ -76,7 +76,7 @@ function setHistoricalServerCapabilities(historyServerCapabilities, defaultPrope
|
|
|
76
76
|
function setUInt32(propName) {
|
|
77
77
|
const lowerCase = utils.lowerFirstLetter(propName);
|
|
78
78
|
/* istanbul ignore next */
|
|
79
|
-
if (!
|
|
79
|
+
if (!Object.prototype.hasOwnProperty.call(historyServerCapabilities, lowerCase)) {
|
|
80
80
|
throw new Error("cannot find " + lowerCase);
|
|
81
81
|
}
|
|
82
82
|
const value = defaultProperties[lowerCase];
|
package/dist/aggregates.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregates.js","sourceRoot":"","sources":["../source/aggregates.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,+DAAyD;AACzD,yDAA+C;AAC/C,0CAA0C;AAC1C,2DAA8C;
|
|
1
|
+
{"version":3,"file":"aggregates.js","sourceRoot":"","sources":["../source/aggregates.ts"],"names":[],"mappings":"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"}
|
package/dist/average.js
CHANGED
|
@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getAverageData = void 0;
|
|
4
4
|
const node_opcua_data_value_1 = require("node-opcua-data-value");
|
|
5
5
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
6
|
+
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
6
7
|
const common_1 = require("./common");
|
|
7
8
|
const interval_1 = require("./interval");
|
|
8
|
-
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
9
9
|
function calculateIntervalAverageValue(interval, options) {
|
|
10
10
|
const indexStart = interval.index;
|
|
11
11
|
let statusCode;
|
|
12
12
|
let isPartial = interval.isPartial;
|
|
13
|
-
|
|
13
|
+
const isRaw = false;
|
|
14
14
|
let hasBad = false;
|
|
15
15
|
const values = [];
|
|
16
16
|
for (let i = indexStart; i < indexStart + interval.count; i++) {
|
|
@@ -42,7 +42,7 @@ function calculateIntervalAverageValue(interval, options) {
|
|
|
42
42
|
if (values.length === 0) {
|
|
43
43
|
return new node_opcua_data_value_1.DataValue({
|
|
44
44
|
sourceTimestamp: interval.startTime,
|
|
45
|
-
statusCode: node_opcua_status_code_1.StatusCodes.BadNoData
|
|
45
|
+
statusCode: node_opcua_status_code_1.StatusCodes.BadNoData
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
48
|
const mean = values.reduce((p, c) => p + c, 0) / values.length;
|
|
@@ -50,12 +50,13 @@ function calculateIntervalAverageValue(interval, options) {
|
|
|
50
50
|
sourceTimestamp: interval.startTime,
|
|
51
51
|
statusCode: statusCode,
|
|
52
52
|
value: {
|
|
53
|
-
dataType: node_opcua_variant_1.DataType.Double,
|
|
53
|
+
dataType: node_opcua_variant_1.DataType.Double,
|
|
54
|
+
value: mean
|
|
54
55
|
}
|
|
55
56
|
});
|
|
56
57
|
}
|
|
57
58
|
function getAverageData(node, processingInterval, startDate, endDate, callback) {
|
|
58
|
-
|
|
59
|
+
(0, common_1.getAggregateData)(node, processingInterval, startDate, endDate, calculateIntervalAverageValue, callback);
|
|
59
60
|
}
|
|
60
61
|
exports.getAverageData = getAverageData;
|
|
61
62
|
//# sourceMappingURL=average.js.map
|
package/dist/average.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"average.js","sourceRoot":"","sources":["../source/average.ts"],"names":[],"mappings":";;;AACA,iEAAkD;AAClD,2DAAuD;AACvD,qCAA4C;AAC5C,yCAA6E;
|
|
1
|
+
{"version":3,"file":"average.js","sourceRoot":"","sources":["../source/average.ts"],"names":[],"mappings":";;;AACA,iEAAkD;AAClD,2DAAuD;AACvD,mEAAiE;AAEjE,qCAA4C;AAC5C,yCAA6E;AAE7E,SAAS,6BAA6B,CAAC,QAAkB,EAAE,OAAsC;IAC7F,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC;IAClC,IAAI,UAAsB,CAAC;IAC3B,IAAI,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IAEnC,MAAM,KAAK,GAAG,KAAK,CAAC;IACpB,IAAI,MAAM,GAAG,KAAK,CAAC;IAEnB,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,UAAU,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QAC3D,MAAM,SAAS,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAEzC,IAAI,SAAS,CAAC,UAAU,KAAK,oCAAW,CAAC,SAAS,EAAE;YAChD,SAAS,GAAG,IAAI,CAAC;YACjB,SAAS;SACZ;QAED,IAAI,CAAC,IAAA,iBAAM,EAAC,SAAS,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,GAAG,IAAI,CAAC;YACd,SAAS;SACZ;QACD,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;KACtC;IAED,IAAI,KAAK,EAAE;QACP,IAAI,MAAM,EAAE;YACR,UAAU,GAAG,oCAAW,CAAC,sBAAsB,CAAC;SACnD;aAAM;YACH,UAAU,GAAG,oCAAW,CAAC,IAAI,CAAC;SACjC;KACJ;SAAM,IAAI,MAAM,EAAE;QACf,UAAU,GAAG,mCAAU,CAAC,cAAc,CAAC,oCAAW,CAAC,sBAAsB,EAAE,qBAAqB,CAAC,CAAC;KACrG;SAAM;QACH,UAAU,GAAG,mCAAU,CAAC,cAAc,CAAC,oCAAW,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;KACnF;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,OAAO,IAAI,iCAAS,CAAC;YACjB,eAAe,EAAE,QAAQ,CAAC,SAAS;YACnC,UAAU,EAAE,oCAAW,CAAC,SAAS;SACpC,CAAC,CAAC;KACN;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;IAE/D,OAAO,IAAI,iCAAS,CAAC;QACjB,eAAe,EAAE,QAAQ,CAAC,SAAS;QACnC,UAAU,EAAE,UAAwB;QACpC,KAAK,EAAE;YACH,QAAQ,EAAE,6BAAQ,CAAC,MAAM;YACzB,KAAK,EAAE,IAAI;SACd;KACJ,CAAC,CAAC;AACP,CAAC;AAED,SAAgB,cAAc,CAC1B,IAAgB,EAChB,kBAA0B,EAC1B,SAAe,EACf,OAAa,EACb,QAA+D;IAE/D,IAAA,yBAAgB,EAAC,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,OAAO,EAAE,6BAA6B,EAAE,QAAQ,CAAC,CAAC;AAC5G,CAAC;AARD,wCAQC"}
|
package/dist/common.js
CHANGED
|
@@ -9,6 +9,7 @@ const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
|
9
9
|
const node_opcua_data_value_1 = require("node-opcua-data-value");
|
|
10
10
|
const node_opcua_service_history_1 = require("node-opcua-service-history");
|
|
11
11
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
12
|
+
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
12
13
|
const aggregates_1 = require("./aggregates");
|
|
13
14
|
const interval_1 = require("./interval");
|
|
14
15
|
/**
|
|
@@ -52,15 +53,24 @@ function getAggregateData(node, processingInterval, startDate, endDate, lambda,
|
|
|
52
53
|
if (processingInterval <= 0) {
|
|
53
54
|
throw new Error("Invalid processing interval, shall be greater than 0");
|
|
54
55
|
}
|
|
55
|
-
const
|
|
56
|
+
const continuationPointManager = new node_opcua_address_space_1.ContinuationPointManager();
|
|
57
|
+
const context = new node_opcua_address_space_1.SessionContext({
|
|
58
|
+
session: {
|
|
59
|
+
continuationPointManager,
|
|
60
|
+
getSessionId: () => (0, node_opcua_nodeid_1.coerceNodeId)("i=0")
|
|
61
|
+
}
|
|
62
|
+
});
|
|
56
63
|
const historyReadDetails = new node_opcua_service_history_1.ReadRawModifiedDetails({
|
|
57
64
|
endTime: endDate,
|
|
58
65
|
startTime: startDate,
|
|
66
|
+
isReadModified: false,
|
|
67
|
+
numValuesPerNode: 0
|
|
68
|
+
// returnBounds: true,
|
|
59
69
|
});
|
|
60
70
|
const indexRange = null;
|
|
61
71
|
const dataEncoding = null;
|
|
62
72
|
const continuationPoint = null;
|
|
63
|
-
node.historyRead(context, historyReadDetails, indexRange, dataEncoding, continuationPoint, (err, result) => {
|
|
73
|
+
node.historyRead(context, historyReadDetails, indexRange, dataEncoding, { continuationPoint }, (err, result) => {
|
|
64
74
|
/* istanbul ignore next */
|
|
65
75
|
if (err) {
|
|
66
76
|
return callback(err);
|
package/dist/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../source/common.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../source/common.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module node-opca-aggregates
|
|
3
3
|
*/
|
|
4
|
-
export { addAggregateSupport, installAggregateConfigurationOptions, getAggregateConfiguration
|
|
4
|
+
export { addAggregateSupport, installAggregateConfigurationOptions, getAggregateConfiguration } from "./aggregates";
|
|
5
5
|
export * from "./interpolate";
|
|
6
6
|
export * from "./minmax";
|
|
7
7
|
export * from "./interval";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA;;GAEG;AACH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA;;GAEG;AACH,2CAAoH;AAA3G,iHAAA,mBAAmB,OAAA;AAAE,kIAAA,oCAAoC,OAAA;AAAE,uHAAA,yBAAyB,OAAA;AAC7F,gDAA8B;AAC9B,2CAAyB;AACzB,6CAA2B;AAC3B,2CAAyB;AACzB,4CAA0B;AAC1B,2DAAyC;AACzC,6DAAyD;AAAhD,yHAAA,iBAAiB,OAAA"}
|
package/dist/interpolate.d.ts
CHANGED
package/dist/interpolate.js
CHANGED
|
@@ -28,10 +28,9 @@ function interpolatedValue(interval, options) {
|
|
|
28
28
|
const interpValue = new node_opcua_data_value_1.DataValue({
|
|
29
29
|
sourceTimestamp: interval.startTime,
|
|
30
30
|
statusCode: node_opcua_status_code_1.StatusCodes.Bad,
|
|
31
|
-
value: previousDataValue.value
|
|
31
|
+
value: previousDataValue.value
|
|
32
32
|
});
|
|
33
|
-
interpValue.statusCode =
|
|
34
|
-
node_opcua_status_code_1.StatusCode.makeStatusCode(node_opcua_status_code_1.StatusCodes.UncertainDataSubNormal, "HistorianInterpolated");
|
|
33
|
+
interpValue.statusCode = node_opcua_status_code_1.StatusCode.makeStatusCode(node_opcua_status_code_1.StatusCodes.UncertainDataSubNormal, "HistorianInterpolated");
|
|
35
34
|
return interpValue;
|
|
36
35
|
};
|
|
37
36
|
if (interval.index === -1) {
|
|
@@ -43,7 +42,7 @@ function interpolatedValue(interval, options) {
|
|
|
43
42
|
return new node_opcua_data_value_1.DataValue({
|
|
44
43
|
sourceTimestamp: interval.startTime,
|
|
45
44
|
statusCode: node_opcua_status_code_1.StatusCodes.BadNoData,
|
|
46
|
-
value: undefined
|
|
45
|
+
value: undefined
|
|
47
46
|
});
|
|
48
47
|
}
|
|
49
48
|
if (!options.useSlopedExtrapolation) {
|
|
@@ -59,7 +58,7 @@ function interpolatedValue(interval, options) {
|
|
|
59
58
|
// tslint:disable:no-bitwise
|
|
60
59
|
if (prev2.index + 1 < prev1.index || prev1.index < interval.dataValues.length - 1) {
|
|
61
60
|
// some bad data exist in between = change status code
|
|
62
|
-
const mask =
|
|
61
|
+
const mask = 0x0000ffffff;
|
|
63
62
|
const extraBits = interpVal.statusCode.value & mask;
|
|
64
63
|
interpVal.statusCode = node_opcua_status_code_1.StatusCode.makeStatusCode(node_opcua_status_code_1.StatusCodes.UncertainDataSubNormal, extraBits);
|
|
65
64
|
}
|
|
@@ -105,15 +104,12 @@ function interpolatedValue(interval, options) {
|
|
|
105
104
|
// where V
|
|
106
105
|
// x is a value at ‘x’ and Tx is the timestamp associated with Vx.
|
|
107
106
|
const interpolatedDataValue = (0, common_1.interpolateValue)(before.dataValue, next.dataValue, interval.startTime);
|
|
108
|
-
if (before.index + 1 < next.index
|
|
109
|
-
|| !(0, interval_1.isGood)(next.dataValue.statusCode)
|
|
110
|
-
|| !(0, interval_1.isGood)(before.dataValue.statusCode)) {
|
|
107
|
+
if (before.index + 1 < next.index || !(0, interval_1.isGood)(next.dataValue.statusCode) || !(0, interval_1.isGood)(before.dataValue.statusCode)) {
|
|
111
108
|
// tslint:disable:no-bitwise
|
|
112
109
|
// some bad data exist in between = change status code
|
|
113
|
-
const mask =
|
|
110
|
+
const mask = 0x0000ffffff;
|
|
114
111
|
const extraBits = interpolatedDataValue.statusCode.value & mask;
|
|
115
|
-
interpolatedDataValue.statusCode =
|
|
116
|
-
node_opcua_status_code_1.StatusCode.makeStatusCode(node_opcua_status_code_1.StatusCodes.UncertainDataSubNormal, extraBits);
|
|
112
|
+
interpolatedDataValue.statusCode = node_opcua_status_code_1.StatusCode.makeStatusCode(node_opcua_status_code_1.StatusCodes.UncertainDataSubNormal, extraBits);
|
|
117
113
|
}
|
|
118
114
|
// check if uncertain or bad value exist between before/next
|
|
119
115
|
// todo
|
|
@@ -129,7 +125,7 @@ exports.interpolatedValue = interpolatedValue;
|
|
|
129
125
|
* @param callback
|
|
130
126
|
*/
|
|
131
127
|
function getInterpolatedData(node, processingInterval, startDate, endDate, callback) {
|
|
132
|
-
|
|
128
|
+
(0, common_1.getAggregateData)(node, processingInterval, startDate, endDate, interpolatedValue, callback);
|
|
133
129
|
}
|
|
134
130
|
exports.getInterpolatedData = getInterpolatedData;
|
|
135
131
|
//# sourceMappingURL=interpolate.js.map
|
package/dist/interpolate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interpolate.js","sourceRoot":"","sources":["../source/interpolate.ts"],"names":[],"mappings":";;;AAwCA,yDAA2C;AAC3C,iEAAkD;AAClD,mEAAiE;AAEjE,qCAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"interpolate.js","sourceRoot":"","sources":["../source/interpolate.ts"],"names":[],"mappings":"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"}
|
package/dist/minmax.js
CHANGED
|
@@ -5,6 +5,7 @@ const node_opcua_data_value_1 = require("node-opcua-data-value");
|
|
|
5
5
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
6
6
|
const common_1 = require("./common");
|
|
7
7
|
const interval_1 = require("./interval");
|
|
8
|
+
// eslint-disable-next-line max-statements
|
|
8
9
|
function calculateIntervalMinOrMaxValue(interval, options, predicate) {
|
|
9
10
|
// console.log(interval.toString());
|
|
10
11
|
const indexStart = interval.index;
|
|
@@ -75,11 +76,11 @@ function calculateIntervalMinOrMaxValue(interval, options, predicate) {
|
|
|
75
76
|
});
|
|
76
77
|
}
|
|
77
78
|
function calculateIntervalMinValue(interval, options) {
|
|
78
|
-
return calculateIntervalMinOrMaxValue(interval, options, (a, b) => a.value > b.value ? "select" :
|
|
79
|
+
return calculateIntervalMinOrMaxValue(interval, options, (a, b) => a.value > b.value ? "select" : a.value === b.value ? "equal" : "reject");
|
|
79
80
|
}
|
|
80
81
|
exports.calculateIntervalMinValue = calculateIntervalMinValue;
|
|
81
82
|
function calculateIntervalMaxValue(interval, options) {
|
|
82
|
-
return calculateIntervalMinOrMaxValue(interval, options, (a, b) => a.value < b.value ? "select" :
|
|
83
|
+
return calculateIntervalMinOrMaxValue(interval, options, (a, b) => a.value < b.value ? "select" : a.value === b.value ? "equal" : "reject");
|
|
83
84
|
}
|
|
84
85
|
exports.calculateIntervalMaxValue = calculateIntervalMaxValue;
|
|
85
86
|
// From OPC Unified Architecture, Part 13 26 Release 1.04
|
package/dist/minmax.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minmax.js","sourceRoot":"","sources":["../source/minmax.ts"],"names":[],"mappings":";;;AAuDA,iEAAkD;AAClD,mEAAiE;AAGjE,qCAA4C;AAC5C,yCAA6E;AAE7E,SAAS,8BAA8B,CACnC,QAAkB,EAClB,OAAsC,EACtC,SAAoE;
|
|
1
|
+
{"version":3,"file":"minmax.js","sourceRoot":"","sources":["../source/minmax.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ISessionContext,
|
|
1
|
+
import { ISessionContext, UAVariable, ContinuationData } from "node-opcua-address-space";
|
|
2
2
|
import { NumericRange } from "node-opcua-numeric-range";
|
|
3
3
|
import { QualifiedNameLike } from "node-opcua-data-model";
|
|
4
4
|
import { CallbackT } from "node-opcua-status-code";
|
|
5
5
|
import { HistoryReadResult, ReadProcessedDetails } from "node-opcua-service-history";
|
|
6
|
-
export declare function readProcessedDetails(variable: UAVariable, context: ISessionContext, historyReadDetails: ReadProcessedDetails, indexRange: NumericRange | null, dataEncoding: QualifiedNameLike | null,
|
|
6
|
+
export declare function readProcessedDetails(variable: UAVariable, context: ISessionContext, historyReadDetails: ReadProcessedDetails, indexRange: NumericRange | null, dataEncoding: QualifiedNameLike | null, continuationData: ContinuationData, callback: CallbackT<HistoryReadResult>): void;
|
|
@@ -3,11 +3,49 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.readProcessedDetails = void 0;
|
|
4
4
|
const node_opcua_constants_1 = require("node-opcua-constants");
|
|
5
5
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
6
|
-
const minmax_1 = require("./minmax");
|
|
7
6
|
const node_opcua_service_history_1 = require("node-opcua-service-history");
|
|
7
|
+
const minmax_1 = require("./minmax");
|
|
8
8
|
const interpolate_1 = require("./interpolate");
|
|
9
9
|
const average_1 = require("./average");
|
|
10
|
-
function
|
|
10
|
+
function _buildResult(err, dataValues, callback2) {
|
|
11
|
+
if (err) {
|
|
12
|
+
return callback2(null, new node_opcua_service_history_1.HistoryReadResult({ statusCode: node_opcua_status_code_1.StatusCodes.BadInternalError }));
|
|
13
|
+
}
|
|
14
|
+
const result = new node_opcua_service_history_1.HistoryReadResult({
|
|
15
|
+
historyData: new node_opcua_service_history_1.HistoryData({
|
|
16
|
+
dataValues
|
|
17
|
+
}),
|
|
18
|
+
statusCode: node_opcua_status_code_1.StatusCodes.Good
|
|
19
|
+
});
|
|
20
|
+
return callback2(null, result);
|
|
21
|
+
}
|
|
22
|
+
function applyAggregate(variable, processingInterval, startTime, endTime, aggregateType, callback2) {
|
|
23
|
+
if (!startTime || !endTime) {
|
|
24
|
+
return _buildResult(new Error("Invalid date time"), undefined, callback2);
|
|
25
|
+
}
|
|
26
|
+
const buildResult = (err, dataValues) => {
|
|
27
|
+
_buildResult(err, dataValues, callback2);
|
|
28
|
+
};
|
|
29
|
+
switch (aggregateType.value) {
|
|
30
|
+
case node_opcua_constants_1.AggregateFunction.Minimum:
|
|
31
|
+
(0, minmax_1.getMinData)(variable, processingInterval, startTime, endTime, buildResult);
|
|
32
|
+
break;
|
|
33
|
+
case node_opcua_constants_1.AggregateFunction.Maximum:
|
|
34
|
+
(0, minmax_1.getMaxData)(variable, processingInterval, startTime, endTime, buildResult);
|
|
35
|
+
break;
|
|
36
|
+
case node_opcua_constants_1.AggregateFunction.Interpolative:
|
|
37
|
+
(0, interpolate_1.getInterpolatedData)(variable, processingInterval, startTime, endTime, buildResult);
|
|
38
|
+
break;
|
|
39
|
+
case node_opcua_constants_1.AggregateFunction.Average:
|
|
40
|
+
(0, average_1.getAverageData)(variable, processingInterval, startTime, endTime, buildResult);
|
|
41
|
+
break;
|
|
42
|
+
case node_opcua_constants_1.AggregateFunction.Count:
|
|
43
|
+
default:
|
|
44
|
+
// todo provide correct implementation
|
|
45
|
+
return callback2(null, new node_opcua_service_history_1.HistoryReadResult({ statusCode: node_opcua_status_code_1.StatusCodes.BadAggregateNotSupported }));
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
function readProcessedDetails(variable, context, historyReadDetails, indexRange, dataEncoding, continuationData, callback) {
|
|
11
49
|
var _a;
|
|
12
50
|
// OPC Unified Architecture, Part 11 27 Release 1.03
|
|
13
51
|
//
|
|
@@ -72,45 +110,10 @@ function readProcessedDetails(variable, context, historyReadDetails, indexRange,
|
|
|
72
110
|
// starting at startTime and ending at endTime.
|
|
73
111
|
const processingInterval = historyReadDetails.processingInterval || endTime.getTime() - startTime.getTime();
|
|
74
112
|
// tslint:disable-next-line: prefer-for-of
|
|
75
|
-
function applyAggregate(aggregateType, callback2) {
|
|
76
|
-
function buildResult(err, dataValues) {
|
|
77
|
-
if (err) {
|
|
78
|
-
return callback2(null, new node_opcua_service_history_1.HistoryReadResult({ statusCode: node_opcua_status_code_1.StatusCodes.BadInternalError }));
|
|
79
|
-
}
|
|
80
|
-
const result = new node_opcua_service_history_1.HistoryReadResult({
|
|
81
|
-
historyData: new node_opcua_service_history_1.HistoryData({
|
|
82
|
-
dataValues
|
|
83
|
-
}),
|
|
84
|
-
statusCode: node_opcua_status_code_1.StatusCodes.Good
|
|
85
|
-
});
|
|
86
|
-
return callback2(null, result);
|
|
87
|
-
}
|
|
88
|
-
if (!startTime || !endTime) {
|
|
89
|
-
return buildResult(new Error("Invalid date time"));
|
|
90
|
-
}
|
|
91
|
-
switch (aggregateType.value) {
|
|
92
|
-
case node_opcua_constants_1.AggregateFunction.Minimum:
|
|
93
|
-
(0, minmax_1.getMinData)(variable, processingInterval, startTime, endTime, buildResult);
|
|
94
|
-
break;
|
|
95
|
-
case node_opcua_constants_1.AggregateFunction.Maximum:
|
|
96
|
-
(0, minmax_1.getMaxData)(variable, processingInterval, startTime, endTime, buildResult);
|
|
97
|
-
break;
|
|
98
|
-
case node_opcua_constants_1.AggregateFunction.Interpolative:
|
|
99
|
-
(0, interpolate_1.getInterpolatedData)(variable, processingInterval, startTime, endTime, buildResult);
|
|
100
|
-
break;
|
|
101
|
-
case node_opcua_constants_1.AggregateFunction.Average:
|
|
102
|
-
(0, average_1.getAverageData)(variable, processingInterval, startTime, endTime, buildResult);
|
|
103
|
-
break;
|
|
104
|
-
case node_opcua_constants_1.AggregateFunction.Count:
|
|
105
|
-
default:
|
|
106
|
-
// todo provide correct implementation
|
|
107
|
-
return callback2(null, new node_opcua_service_history_1.HistoryReadResult({ statusCode: node_opcua_status_code_1.StatusCodes.BadAggregateNotSupported }));
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
113
|
if (((_a = historyReadDetails.aggregateType) === null || _a === void 0 ? void 0 : _a.length) !== 1) {
|
|
111
114
|
return callback(null, new node_opcua_service_history_1.HistoryReadResult({ statusCode: node_opcua_status_code_1.StatusCodes.BadInternalError }));
|
|
112
115
|
}
|
|
113
|
-
return applyAggregate(aggregateTypes[0], callback);
|
|
116
|
+
return applyAggregate(variable, processingInterval, startTime, endTime, aggregateTypes[0], callback);
|
|
114
117
|
}
|
|
115
118
|
exports.readProcessedDetails = readProcessedDetails;
|
|
116
119
|
//# sourceMappingURL=read_processed_details.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read_processed_details.js","sourceRoot":"","sources":["../source/read_processed_details.ts"],"names":[],"mappings":";;;AACA,+DAAyD;AAIzD,mEAAgE;AAIhE,
|
|
1
|
+
{"version":3,"file":"read_processed_details.js","sourceRoot":"","sources":["../source/read_processed_details.ts"],"names":[],"mappings":"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"}
|
package/nyc.config.js
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
module.exports = {
|
|
2
|
-
"extension": [
|
|
3
|
-
".ts",
|
|
4
|
-
".tsx"
|
|
5
|
-
],
|
|
6
|
-
"all": true,
|
|
7
|
-
"include": [
|
|
8
|
-
"dist/**/*.js",
|
|
9
|
-
"source/**/*.ts",
|
|
10
|
-
|
|
11
|
-
],
|
|
12
|
-
"exclude": [
|
|
13
|
-
"**/*.spec.js"
|
|
14
|
-
],
|
|
15
|
-
"check-coverage": true
|
|
16
|
-
};
|
|
1
|
+
module.exports = {
|
|
2
|
+
"extension": [
|
|
3
|
+
".ts",
|
|
4
|
+
".tsx"
|
|
5
|
+
],
|
|
6
|
+
"all": true,
|
|
7
|
+
"include": [
|
|
8
|
+
"dist/**/*.js",
|
|
9
|
+
"source/**/*.ts",
|
|
10
|
+
|
|
11
|
+
],
|
|
12
|
+
"exclude": [
|
|
13
|
+
"**/*.spec.js"
|
|
14
|
+
],
|
|
15
|
+
"check-coverage": true
|
|
16
|
+
};
|
package/package.json
CHANGED
|
@@ -1,33 +1,35 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-aggregates",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.57.0",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module -end2end-test",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
7
7
|
"scripts": {
|
|
8
8
|
"build": "tsc -b",
|
|
9
9
|
"test": "mocha",
|
|
10
|
+
"lint": "eslint source test",
|
|
11
|
+
"format": "prettier --write source test",
|
|
10
12
|
"clean": "node -e \"require('rimraf').sync('dist');\""
|
|
11
13
|
},
|
|
12
14
|
"dependencies": {
|
|
13
15
|
"@types/async": "^3.2.8",
|
|
14
|
-
"node-opcua-address-space": "2.
|
|
16
|
+
"node-opcua-address-space": "2.57.0",
|
|
15
17
|
"node-opcua-constants": "2.52.0",
|
|
16
|
-
"node-opcua-data-model": "2.
|
|
17
|
-
"node-opcua-data-value": "2.
|
|
18
|
-
"node-opcua-nodeid": "2.
|
|
19
|
-
"node-opcua-nodesets": "2.
|
|
20
|
-
"node-opcua-numeric-range": "2.
|
|
21
|
-
"node-opcua-service-history": "2.
|
|
22
|
-
"node-opcua-status-code": "2.
|
|
23
|
-
"node-opcua-types": "2.
|
|
24
|
-
"node-opcua-utils": "2.
|
|
25
|
-
"node-opcua-variant": "2.
|
|
18
|
+
"node-opcua-data-model": "2.57.0",
|
|
19
|
+
"node-opcua-data-value": "2.57.0",
|
|
20
|
+
"node-opcua-nodeid": "2.55.0",
|
|
21
|
+
"node-opcua-nodesets": "2.57.0",
|
|
22
|
+
"node-opcua-numeric-range": "2.57.0",
|
|
23
|
+
"node-opcua-service-history": "2.57.0",
|
|
24
|
+
"node-opcua-status-code": "2.56.0",
|
|
25
|
+
"node-opcua-types": "2.57.0",
|
|
26
|
+
"node-opcua-utils": "2.57.0",
|
|
27
|
+
"node-opcua-variant": "2.57.0"
|
|
26
28
|
},
|
|
27
29
|
"devDependencies": {
|
|
28
30
|
"delayed": "^2.0.0",
|
|
29
|
-
"node-opcua-assert": "2.
|
|
30
|
-
"node-opcua-leak-detector": "2.
|
|
31
|
+
"node-opcua-assert": "2.55.0",
|
|
32
|
+
"node-opcua-leak-detector": "2.56.0",
|
|
31
33
|
"should": "^13.2.3",
|
|
32
34
|
"sinon": "^11.1.2",
|
|
33
35
|
"yargs": "15.4.1"
|
|
@@ -47,5 +49,5 @@
|
|
|
47
49
|
"internet of things"
|
|
48
50
|
],
|
|
49
51
|
"homepage": "http://node-opcua.github.io/",
|
|
50
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "cb6a995ab35ea6231ffca85fbd0b624fe37119d2"
|
|
51
53
|
}
|