node-opcua-aggregates 2.177.0 → 2.179.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/aggregates.d.ts +3 -3
- package/dist/aggregates.js +20 -12
- package/dist/aggregates.js.map +1 -1
- package/dist/average.d.ts +1 -1
- package/dist/average.js +4 -4
- package/dist/average.js.map +1 -1
- package/dist/calculate_bad_good.d.ts +1 -1
- package/dist/calculate_bad_good.js +4 -4
- package/dist/calculate_bad_good.js.map +1 -1
- package/dist/common.d.ts +2 -2
- package/dist/common.js +12 -4
- package/dist/common.js.map +1 -1
- package/dist/count.d.ts +1 -1
- package/dist/count.js +2 -2
- package/dist/count.js.map +1 -1
- package/dist/duration_bad.d.ts +1 -1
- package/dist/duration_bad.js +2 -2
- package/dist/duration_bad.js.map +1 -1
- package/dist/duration_good.d.ts +1 -1
- package/dist/duration_good.js +2 -2
- package/dist/duration_good.js.map +1 -1
- package/dist/index.d.ts +9 -9
- package/dist/index.js +18 -18
- package/dist/index.js.map +1 -1
- package/dist/interpolate.d.ts +2 -2
- package/dist/interpolate.js +3 -5
- package/dist/interpolate.js.map +1 -1
- package/dist/interval.d.ts +2 -2
- package/dist/interval.js +22 -16
- package/dist/interval.js.map +1 -1
- package/dist/minmax.d.ts +2 -2
- package/dist/minmax.js +4 -5
- package/dist/minmax.js.map +1 -1
- package/dist/percent_bad.d.ts +1 -1
- package/dist/percent_bad.js +1 -1
- package/dist/percent_bad.js.map +1 -1
- package/dist/percent_good.d.ts +1 -1
- package/dist/percent_good.js +2 -2
- package/dist/percent_good.js.map +1 -1
- package/dist/read_processed_details.d.ts +6 -6
- package/dist/read_processed_details.js +14 -12
- package/dist/read_processed_details.js.map +1 -1
- package/package.json +19 -19
- package/source/aggregates.ts +30 -21
- package/source/average.ts +6 -6
- package/source/calculate_bad_good.ts +8 -9
- package/source/common.ts +18 -10
- package/source/count.ts +4 -4
- package/source/duration_bad.ts +4 -5
- package/source/duration_good.ts +5 -6
- package/source/index.ts +12 -11
- package/source/interpolate.ts +5 -12
- package/source/interval.ts +29 -23
- package/source/minmax.ts +8 -9
- package/source/percent_bad.ts +3 -4
- package/source/percent_good.ts +4 -5
- package/source/read_processed_details.ts +23 -23
package/dist/aggregates.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module node-opcua-aggregates
|
|
3
3
|
*/
|
|
4
|
+
import type { AddressSpace, BaseNode, IAddressSpace, UAObject, UAServerCapabilities, UAVariable } from "node-opcua-address-space";
|
|
4
5
|
import { AggregateFunction } from "node-opcua-constants";
|
|
5
|
-
import { NodeId, NodeIdLike } from "node-opcua-nodeid";
|
|
6
|
-
import {
|
|
7
|
-
import { AggregateConfigurationOptionsEx } from "./interval";
|
|
6
|
+
import { type NodeId, type NodeIdLike } from "node-opcua-nodeid";
|
|
7
|
+
import type { AggregateConfigurationOptionsEx } from "./interval";
|
|
8
8
|
export declare function createHistoryServerCapabilities(addressSpace: AddressSpace, serverCapabilities: UAServerCapabilities): UAObject;
|
|
9
9
|
export declare function addAggregateFunctionSupport(addressSpace: AddressSpace, aggregateFunctionNodeId: NodeIdLike): void;
|
|
10
10
|
export declare function addAggregateStandardFunctionSupport(addressSpace: AddressSpace, functionName: AggregateFunction): void;
|
package/dist/aggregates.js
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @module node-opcua-aggregates
|
|
4
|
+
*/
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.createHistoryServerCapabilities = createHistoryServerCapabilities;
|
|
4
7
|
exports.addAggregateFunctionSupport = addAggregateFunctionSupport;
|
|
@@ -7,14 +10,11 @@ exports.addAggregateSupport = addAggregateSupport;
|
|
|
7
10
|
exports.getAggregateFunctions = getAggregateFunctions;
|
|
8
11
|
exports.installAggregateConfigurationOptions = installAggregateConfigurationOptions;
|
|
9
12
|
exports.getAggregateConfiguration = getAggregateConfiguration;
|
|
10
|
-
/**
|
|
11
|
-
* @module node-opcua-aggregates
|
|
12
|
-
*/
|
|
13
13
|
const node_opcua_constants_1 = require("node-opcua-constants");
|
|
14
|
+
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
14
15
|
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
15
|
-
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
16
16
|
const node_opcua_utils_1 = require("node-opcua-utils");
|
|
17
|
-
const
|
|
17
|
+
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
18
18
|
const read_processed_details_1 = require("./read_processed_details");
|
|
19
19
|
// import { HistoryServerCapabilities } from "node-opcua-server";
|
|
20
20
|
/*
|
|
@@ -68,25 +68,29 @@ function setHistoricalServerCapabilities(historyServerCapabilities, defaultPrope
|
|
|
68
68
|
function setBoolean(propName) {
|
|
69
69
|
const lowerCase = (0, node_opcua_utils_1.lowerFirstLetter)(propName);
|
|
70
70
|
/* c8 ignore next */
|
|
71
|
-
if (!Object.
|
|
72
|
-
throw new Error(
|
|
71
|
+
if (!Object.hasOwn(defaultProperties, lowerCase)) {
|
|
72
|
+
throw new Error(`cannot find ${lowerCase}`);
|
|
73
73
|
}
|
|
74
74
|
const value = defaultProperties[lowerCase];
|
|
75
75
|
const prop = historyServerCapabilities.getChildByName(propName);
|
|
76
76
|
/* c8 ignore next */
|
|
77
77
|
if (!prop) {
|
|
78
|
-
throw new Error(
|
|
78
|
+
throw new Error(` Cannot find property ${propName}`);
|
|
79
79
|
}
|
|
80
80
|
prop.setValueFromSource({ dataType: node_opcua_variant_1.DataType.Boolean, value });
|
|
81
81
|
}
|
|
82
82
|
function setUInt32(propName) {
|
|
83
83
|
const lowerCase = (0, node_opcua_utils_1.lowerFirstLetter)(propName);
|
|
84
84
|
/* c8 ignore next */
|
|
85
|
-
if (!Object.
|
|
86
|
-
throw new Error(
|
|
85
|
+
if (!Object.hasOwn(historyServerCapabilities, lowerCase)) {
|
|
86
|
+
throw new Error(`cannot find ${lowerCase}`);
|
|
87
87
|
}
|
|
88
88
|
const value = defaultProperties[lowerCase];
|
|
89
89
|
const prop = historyServerCapabilities.getChildByName(propName);
|
|
90
|
+
/* c8 ignore next */
|
|
91
|
+
if (!prop) {
|
|
92
|
+
throw new Error(` Cannot find property ${propName}`);
|
|
93
|
+
}
|
|
90
94
|
prop.setValueFromSource({ dataType: node_opcua_variant_1.DataType.UInt32, value });
|
|
91
95
|
}
|
|
92
96
|
setBoolean("AccessHistoryDataCapability");
|
|
@@ -117,7 +121,7 @@ function addAggregateFunctionSupport(addressSpace, aggregateFunctionNodeId) {
|
|
|
117
121
|
const functionNode = addressSpace.findNode(aggregateFunctionNodeId);
|
|
118
122
|
/* c8 ignore next */
|
|
119
123
|
if (!functionNode) {
|
|
120
|
-
throw new Error(
|
|
124
|
+
throw new Error(`Cannot find node ${aggregateFunctionNodeId.toString()} in addressSpace`);
|
|
121
125
|
}
|
|
122
126
|
/* c8 ignore next */
|
|
123
127
|
if (functionNode.nodeClass !== node_opcua_data_model_1.NodeClass.Object) {
|
|
@@ -168,6 +172,10 @@ function addAggregateSupport(addressSpace, aggregatedFunctions) {
|
|
|
168
172
|
}
|
|
169
173
|
// xx serverObject.
|
|
170
174
|
const serverCapabilities = serverObject.getChildByName("ServerCapabilities");
|
|
175
|
+
/* c8 ignore next */
|
|
176
|
+
if (!serverCapabilities) {
|
|
177
|
+
throw new Error("addressSpace do not expose a ServerCapabilities object");
|
|
178
|
+
}
|
|
171
179
|
// Let see if HistoryServer Capabilities object exists
|
|
172
180
|
let historyServerCapabilities = serverCapabilities.getChildByName("HistoryServerCapabilities");
|
|
173
181
|
/* c8 ignore next */
|
|
@@ -247,7 +255,7 @@ function installAggregateConfigurationOptions(node, options, aggregateFunctions)
|
|
|
247
255
|
// ... to do
|
|
248
256
|
const referenceType = (0, node_opcua_nodeid_1.resolveNodeId)(node_opcua_constants_1.ReferenceTypeIds.Organizes);
|
|
249
257
|
for (const nodeId of aggregateFunctions) {
|
|
250
|
-
uaAggregateFunctions
|
|
258
|
+
uaAggregateFunctions?.addReference({
|
|
251
259
|
nodeId,
|
|
252
260
|
referenceType,
|
|
253
261
|
isForward: true
|
package/dist/aggregates.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregates.js","sourceRoot":"","sources":["../source/aggregates.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"aggregates.js","sourceRoot":"","sources":["../source/aggregates.ts"],"names":[],"mappings":"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"}
|
package/dist/average.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { UAVariable } from "node-opcua-address-space";
|
|
1
|
+
import type { UAVariable } from "node-opcua-address-space";
|
|
2
2
|
import { DataValue } from "node-opcua-data-value";
|
|
3
3
|
export declare function getAverageData(node: UAVariable, processingInterval: number, startDate: Date, endDate: Date, callback: (err: Error | null, dataValues?: DataValue[]) => void): void;
|
package/dist/average.js
CHANGED
|
@@ -2,20 +2,20 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getAverageData = getAverageData;
|
|
4
4
|
const node_opcua_data_value_1 = require("node-opcua-data-value");
|
|
5
|
-
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
6
5
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
6
|
+
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
7
7
|
const common_1 = require("./common");
|
|
8
|
-
function calculateIntervalAverageValue(interval,
|
|
8
|
+
function calculateIntervalAverageValue(interval, _options) {
|
|
9
9
|
const indexStart = interval.index;
|
|
10
10
|
let statusCode;
|
|
11
|
-
let
|
|
11
|
+
let _isPartial = interval.isPartial;
|
|
12
12
|
const isRaw = false;
|
|
13
13
|
let hasBad = false;
|
|
14
14
|
const values = [];
|
|
15
15
|
for (let i = indexStart; i < indexStart + interval.count; i++) {
|
|
16
16
|
const dataValue = interval.dataValues[i];
|
|
17
17
|
if (dataValue.statusCode.equals(node_opcua_status_code_1.StatusCodes.BadNoData)) {
|
|
18
|
-
|
|
18
|
+
_isPartial = true;
|
|
19
19
|
continue;
|
|
20
20
|
}
|
|
21
21
|
if (dataValue.statusCode.isNotGood()) {
|
package/dist/average.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"average.js","sourceRoot":"","sources":["../source/average.ts"],"names":[],"mappings":";;AA8DA,wCAQC;AArED,iEAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"average.js","sourceRoot":"","sources":["../source/average.ts"],"names":[],"mappings":";;AA8DA,wCAQC;AArED,iEAAkD;AAClD,mEAAiE;AACjE,2DAA8C;AAE9C,qCAA4C;AAG5C,SAAS,6BAA6B,CAAC,QAAkB,EAAE,QAAuC;IAC9F,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC;IAClC,IAAI,UAAsB,CAAC;IAC3B,IAAI,UAAU,GAAG,QAAQ,CAAC,SAAS,CAAC;IAEpC,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,CAAC;QAC5D,MAAM,SAAS,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAEzC,IAAI,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,oCAAW,CAAC,SAAS,CAAC,EAAE,CAAC;YACrD,UAAU,GAAG,IAAI,CAAC;YAClB,SAAS;QACb,CAAC;QAED,IAAI,SAAS,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE,CAAC;YACnC,MAAM,GAAG,IAAI,CAAC;YACd,SAAS;QACb,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACR,IAAI,MAAM,EAAE,CAAC;YACT,UAAU,GAAG,oCAAW,CAAC,sBAAsB,CAAC;QACpD,CAAC;aAAM,CAAC;YACJ,UAAU,GAAG,oCAAW,CAAC,IAAI,CAAC;QAClC,CAAC;IACL,CAAC;SAAM,IAAI,MAAM,EAAE,CAAC;QAChB,UAAU,GAAG,mCAAU,CAAC,cAAc,CAAC,oCAAW,CAAC,sBAAsB,EAAE,qBAAqB,CAAC,CAAC;IACtG,CAAC;SAAM,CAAC;QACJ,UAAU,GAAG,mCAAU,CAAC,cAAc,CAAC,oCAAW,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IACpF,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,IAAI,iCAAS,CAAC;YACjB,eAAe,EAAE,QAAQ,CAAC,SAAS;YACnC,UAAU,EAAE,oCAAW,CAAC,SAAS;SACpC,CAAC,CAAC;IACP,CAAC;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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { StatusCode } from "node-opcua-status-code";
|
|
2
|
-
import {
|
|
2
|
+
import { type AggregateConfigurationOptions, type Interval } from "./interval";
|
|
3
3
|
export declare function calculateBadAndGood(interval: Interval, options: AggregateConfigurationOptions): {
|
|
4
4
|
durationGood: number;
|
|
5
5
|
durationBad: number;
|
|
@@ -11,7 +11,7 @@ const a = (s, options) => !s || s === node_opcua_status_code_1.StatusCodes.BadNo
|
|
|
11
11
|
function findLowBound(interval, options) {
|
|
12
12
|
const indexStart = interval.index;
|
|
13
13
|
const initialValue = interval.dataValues[indexStart];
|
|
14
|
-
if (initialValue.sourceTimestamp
|
|
14
|
+
if (initialValue.sourceTimestamp?.getTime() === interval.startTime.getTime()) {
|
|
15
15
|
return { previousStatus: initialValue.statusCode, previousTime: interval.startTime.getTime(), indexStart: indexStart + 1 };
|
|
16
16
|
}
|
|
17
17
|
const previousStatus = indexStart === 0 || !interval.dataValues[indexStart - 1]
|
|
@@ -20,7 +20,6 @@ function findLowBound(interval, options) {
|
|
|
20
20
|
const previousTime = interval.startTime.getTime();
|
|
21
21
|
return { previousStatus, previousTime, indexStart };
|
|
22
22
|
}
|
|
23
|
-
// eslint-disable-next-line max-statements, complexity
|
|
24
23
|
function calculateBadAndGood(interval, options) {
|
|
25
24
|
if (interval.count === 0) {
|
|
26
25
|
return {
|
|
@@ -60,6 +59,9 @@ function calculateBadAndGood(interval, options) {
|
|
|
60
59
|
if (currentStatus === node_opcua_status_code_1.StatusCodes.BadNoData) {
|
|
61
60
|
partialFlag = node_opcua_status_code_1.extraStatusCodeBits.HistorianPartial;
|
|
62
61
|
}
|
|
62
|
+
if (!dataValue.sourceTimestamp) {
|
|
63
|
+
throw new Error("calculateBadAndGood: dataValue is missing a sourceTimestamp");
|
|
64
|
+
}
|
|
63
65
|
const currentTime = dataValue.sourceTimestamp.getTime();
|
|
64
66
|
// debugLog(" ", dataValue.sourceTimestamp?.toISOString(), dataValue.statusCode.toString(), dataValue.value.value);
|
|
65
67
|
if (currentStatus === previousStatus)
|
|
@@ -103,11 +105,9 @@ function calculateBadAndGood(interval, options) {
|
|
|
103
105
|
const effectiveProcessingInterval = currentTime - interval.startTime.getTime();
|
|
104
106
|
const percentGood = (durationGood / effectiveProcessingInterval) * 100;
|
|
105
107
|
const percentBad = (durationBad / effectiveProcessingInterval) * 100;
|
|
106
|
-
let percentDataGood = options.percentDataGood === undefined ? 100 : options.percentDataGood;
|
|
107
108
|
const percentDataBad = options.percentDataBad === undefined ? 100 : options.percentDataBad;
|
|
108
109
|
if (percentBad >= percentDataBad || (nbGood === 0 && nbUncertain === 0)) {
|
|
109
110
|
durationGood = 0; // BAD
|
|
110
|
-
percentDataGood = -1;
|
|
111
111
|
// const statusCode = StatusCodes.Bad;
|
|
112
112
|
//return { durationGood, durationBad, durationUnknown, percentBad, percentGood, statusCode };
|
|
113
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculate_bad_good.js","sourceRoot":"","sources":["../source/calculate_bad_good.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"calculate_bad_good.js","sourceRoot":"","sources":["../source/calculate_bad_good.ts"],"names":[],"mappings":"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"}
|
package/dist/common.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module node-opca-aggregates
|
|
3
3
|
*/
|
|
4
|
-
import { UAVariable } from "node-opcua-address-space";
|
|
4
|
+
import { type UAVariable } from "node-opcua-address-space";
|
|
5
5
|
import { DataValue } from "node-opcua-data-value";
|
|
6
|
-
import {
|
|
6
|
+
import { type AggregateConfigurationOptionsEx, type Interval } from "./interval";
|
|
7
7
|
export declare function getAggregateData(node: UAVariable, processingInterval: number, startDate: Date, endDate: Date, lambda: (interval: Interval, aggregateConfiguration: AggregateConfigurationOptionsEx) => DataValue, callback: (err: Error | null, dataValues?: DataValue[]) => void): void;
|
|
8
8
|
export declare function interpolateValue(dataValue1: DataValue, dataValue2: DataValue, date: Date): DataValue;
|
package/dist/common.js
CHANGED
|
@@ -8,9 +8,9 @@ exports.interpolateValue = interpolateValue;
|
|
|
8
8
|
const node_opcua_address_space_1 = require("node-opcua-address-space");
|
|
9
9
|
const node_opcua_data_model_1 = require("node-opcua-data-model");
|
|
10
10
|
const node_opcua_data_value_1 = require("node-opcua-data-value");
|
|
11
|
+
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
11
12
|
const node_opcua_service_history_1 = require("node-opcua-service-history");
|
|
12
13
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
13
|
-
const node_opcua_nodeid_1 = require("node-opcua-nodeid");
|
|
14
14
|
const aggregates_1 = require("./aggregates");
|
|
15
15
|
const interval_1 = require("./interval");
|
|
16
16
|
/**
|
|
@@ -28,7 +28,7 @@ function processAggregateData(node, processingInterval, startDate, endDate, data
|
|
|
28
28
|
const interval = (0, interval_1.getInterval)(sourceTimestamp, processingInterval, indexHint, dataValues);
|
|
29
29
|
const dataValue = lambda(interval, aggregateConfiguration);
|
|
30
30
|
/* c8 ignore next */
|
|
31
|
-
if (!dataValue
|
|
31
|
+
if (!dataValue?.sourceTimestamp) {
|
|
32
32
|
// const dataValue = interval.interpolatedValue(aggregateConfiguration);
|
|
33
33
|
throw Error("invalid DataValue");
|
|
34
34
|
}
|
|
@@ -42,11 +42,13 @@ function processAggregateData(node, processingInterval, startDate, endDate, data
|
|
|
42
42
|
function getAggregateData(node, processingInterval, startDate, endDate, lambda, callback) {
|
|
43
43
|
/* c8 ignore next */
|
|
44
44
|
if (node.nodeClass !== node_opcua_data_model_1.NodeClass.Variable) {
|
|
45
|
-
|
|
45
|
+
callback(new Error("node must be UAVariable"));
|
|
46
|
+
return;
|
|
46
47
|
}
|
|
47
48
|
/* c8 ignore next */
|
|
48
49
|
if (processingInterval <= 0) {
|
|
49
|
-
|
|
50
|
+
callback(new Error("Invalid processing interval, shall be greater than 0"));
|
|
51
|
+
return;
|
|
50
52
|
}
|
|
51
53
|
const continuationPointManager = new node_opcua_address_space_1.ContinuationPointManager();
|
|
52
54
|
const context = new node_opcua_address_space_1.SessionContext({
|
|
@@ -70,12 +72,18 @@ function getAggregateData(node, processingInterval, startDate, endDate, lambda,
|
|
|
70
72
|
if (err) {
|
|
71
73
|
return callback(err);
|
|
72
74
|
}
|
|
75
|
+
if (!result) {
|
|
76
|
+
return callback(new Error("getAggregateData: expecting a result when err is null"));
|
|
77
|
+
}
|
|
73
78
|
const historyData = result.historyData;
|
|
74
79
|
const dataValues = historyData.dataValues || [];
|
|
75
80
|
processAggregateData(node, processingInterval, startDate, endDate, dataValues, lambda, callback);
|
|
76
81
|
});
|
|
77
82
|
}
|
|
78
83
|
function interpolateValue(dataValue1, dataValue2, date) {
|
|
84
|
+
if (!dataValue1.sourceTimestamp || !dataValue2.sourceTimestamp) {
|
|
85
|
+
throw new Error("interpolateValue: both dataValues must have a sourceTimestamp");
|
|
86
|
+
}
|
|
79
87
|
const t0 = dataValue1.sourceTimestamp.getTime();
|
|
80
88
|
const t = date.getTime();
|
|
81
89
|
const t1 = dataValue2.sourceTimestamp.getTime();
|
package/dist/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../source/common.ts"],"names":[],"mappings":";;AAuDA,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../source/common.ts"],"names":[],"mappings":"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"}
|
package/dist/count.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { UAVariable } from "node-opcua-address-space";
|
|
1
|
+
import type { UAVariable } from "node-opcua-address-space";
|
|
2
2
|
import { DataValue } from "node-opcua-data-value";
|
|
3
3
|
export declare function getCountData(node: UAVariable, processingInterval: number, startDate: Date, endDate: Date, callback: (err: Error | null, dataValues?: DataValue[]) => void): void;
|
package/dist/count.js
CHANGED
|
@@ -21,7 +21,7 @@ function calculateCountValue(interval, options) {
|
|
|
21
21
|
let nbUncertain = 0;
|
|
22
22
|
let badDuration = 0;
|
|
23
23
|
let uncertainDuration = 0;
|
|
24
|
-
let
|
|
24
|
+
let _goodDuration = 0;
|
|
25
25
|
for (let i = indexStart; i < indexStart + interval.count; i++) {
|
|
26
26
|
const dataValue = interval.dataValues[i];
|
|
27
27
|
if (dataValue.statusCode.equals(node_opcua_status_code_1.StatusCodes.BadNoData)) {
|
|
@@ -39,7 +39,7 @@ function calculateCountValue(interval, options) {
|
|
|
39
39
|
}
|
|
40
40
|
else if (dataValue.statusCode.isGoodish()) {
|
|
41
41
|
nbGood++;
|
|
42
|
-
|
|
42
|
+
_goodDuration += regionDuration;
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
const partialFlag = isPartial ? node_opcua_status_code_1.extraStatusCodeBits.HistorianPartial : 0;
|
package/dist/count.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"count.js","sourceRoot":"","sources":["../source/count.ts"],"names":[],"mappings":";;AAyFA,oCAQC;AAhGD,iEAAkD;AAClD,mEAAsF;AACtF,2DAA8C;AAE9C,qCAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"count.js","sourceRoot":"","sources":["../source/count.ts"],"names":[],"mappings":"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"}
|
package/dist/duration_bad.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { UAVariable } from "node-opcua-address-space";
|
|
1
|
+
import type { UAVariable } from "node-opcua-address-space";
|
|
2
2
|
import { DataValue } from "node-opcua-data-value";
|
|
3
3
|
/**Retrieve the percentage of data (0 to 100) in the interval which has Bad StatusCode. */
|
|
4
4
|
export declare function getDurationBadData(node: UAVariable, processingInterval: number, startDate: Date, endDate: Date, callback: (err: Error | null, dataValues?: DataValue[]) => void): void;
|
package/dist/duration_bad.js
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getDurationBadData = getDurationBadData;
|
|
4
4
|
const node_opcua_data_value_1 = require("node-opcua-data-value");
|
|
5
|
-
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
6
5
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
7
|
-
const
|
|
6
|
+
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
8
7
|
const calculate_bad_good_1 = require("./calculate_bad_good");
|
|
8
|
+
const common_1 = require("./common");
|
|
9
9
|
function calculateDurationBad(interval, options) {
|
|
10
10
|
const { durationBad, durationUnknown, statusCode } = (0, calculate_bad_good_1.calculateBadAndGood)(interval, options);
|
|
11
11
|
if (durationUnknown > 0 && durationBad === 0) {
|
package/dist/duration_bad.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"duration_bad.js","sourceRoot":"","sources":["../source/duration_bad.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"duration_bad.js","sourceRoot":"","sources":["../source/duration_bad.ts"],"names":[],"mappings":";;AA2BA,gDAQC;AAlCD,iEAAkD;AAClD,mEAAqD;AACrD,2DAA8C;AAC9C,6DAA2D;AAC3D,qCAA4C;AAG5C,SAAS,oBAAoB,CAAC,QAAkB,EAAE,OAAsC;IACpF,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,IAAA,wCAAmB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC5F,IAAI,eAAe,GAAG,CAAC,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO,IAAI,iCAAS,CAAC;YACjB,eAAe,EAAE,QAAQ,CAAC,SAAS;YACnC,UAAU,EAAE,oCAAW,CAAC,GAAG;SAC9B,CAAC,CAAC;IACP,CAAC;IACD,MAAM,KAAK,GAAG,WAAW,CAAC;IAC1B,IAAI,UAAU,CAAC,SAAS,EAAE,EAAE,CAAC;QACzB,OAAO,IAAI,iCAAS,CAAC;YACjB,eAAe,EAAE,QAAQ,CAAC,SAAS;YACnC,UAAU;YACV,KAAK,EAAE,EAAE,QAAQ,EAAE,6BAAQ,CAAC,MAAM,EAAE,KAAK,EAAE;SAC9C,CAAC,CAAC;IACP,CAAC;IACD,OAAO,IAAI,iCAAS,CAAC,EAAE,eAAe,EAAE,QAAQ,CAAC,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,6BAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAClH,CAAC;AACD,0FAA0F;AAC1F,SAAgB,kBAAkB,CAC9B,IAAgB,EAChB,kBAA0B,EAC1B,SAAe,EACf,OAAa,EACb,QAA+D;IAE/D,IAAA,yBAAgB,EAAC,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,OAAO,EAAE,oBAAoB,EAAE,QAAQ,CAAC,CAAC;AACnG,CAAC"}
|
package/dist/duration_good.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { UAVariable } from "node-opcua-address-space";
|
|
1
|
+
import type { UAVariable } from "node-opcua-address-space";
|
|
2
2
|
import { DataValue } from "node-opcua-data-value";
|
|
3
3
|
/**Retrieve the percentage of data (0 to 100) in the interval which has Bad StatusCode. */
|
|
4
4
|
export declare function getDurationGoodData(node: UAVariable, processingInterval: number, startDate: Date, endDate: Date, callback: (err: Error | null, dataValues?: DataValue[]) => void): void;
|
package/dist/duration_good.js
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getDurationGoodData = getDurationGoodData;
|
|
4
4
|
const node_opcua_data_value_1 = require("node-opcua-data-value");
|
|
5
|
-
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
6
5
|
const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
7
|
-
const
|
|
6
|
+
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
8
7
|
const calculate_bad_good_1 = require("./calculate_bad_good");
|
|
8
|
+
const common_1 = require("./common");
|
|
9
9
|
function calculateDurationGood(interval, options) {
|
|
10
10
|
const { durationGood, durationUnknown, statusCode } = (0, calculate_bad_good_1.calculateBadAndGood)(interval, options);
|
|
11
11
|
if (durationUnknown > 0 && durationGood === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"duration_good.js","sourceRoot":"","sources":["../source/duration_good.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"duration_good.js","sourceRoot":"","sources":["../source/duration_good.ts"],"names":[],"mappings":";;AA2BA,kDAQC;AAlCD,iEAAkD;AAClD,mEAAqD;AACrD,2DAA8C;AAC9C,6DAA2D;AAC3D,qCAA4C;AAG5C,SAAS,qBAAqB,CAAC,QAAkB,EAAE,OAAsC;IACrF,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,IAAA,wCAAmB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7F,IAAI,eAAe,GAAG,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,iCAAS,CAAC;YACjB,eAAe,EAAE,QAAQ,CAAC,SAAS;YACnC,UAAU,EAAE,oCAAW,CAAC,GAAG;SAC9B,CAAC,CAAC;IACP,CAAC;IACD,MAAM,KAAK,GAAG,YAAY,CAAC;IAC3B,IAAI,UAAU,CAAC,SAAS,EAAE,EAAE,CAAC;QACzB,OAAO,IAAI,iCAAS,CAAC;YACjB,eAAe,EAAE,QAAQ,CAAC,SAAS;YACnC,UAAU;YACV,KAAK,EAAE,EAAE,QAAQ,EAAE,6BAAQ,CAAC,MAAM,EAAE,KAAK,EAAE;SAC9C,CAAC,CAAC;IACP,CAAC;IACD,OAAO,IAAI,iCAAS,CAAC,EAAE,eAAe,EAAE,QAAQ,CAAC,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,6BAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAClH,CAAC;AACD,0FAA0F;AAC1F,SAAgB,mBAAmB,CAC/B,IAAgB,EAChB,kBAA0B,EAC1B,SAAe,EACf,OAAa,EACb,QAA+D;IAE/D,IAAA,yBAAgB,EAAC,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,OAAO,EAAE,qBAAqB,EAAE,QAAQ,CAAC,CAAC;AACpG,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module node-opca-aggregates
|
|
3
3
|
*/
|
|
4
|
-
export { addAggregateSupport, installAggregateConfigurationOptions, getAggregateConfiguration, addAggregateStandardFunctionSupport, addAggregateFunctionSupport } from "./aggregates";
|
|
5
|
-
export * from "./interpolate";
|
|
6
|
-
export * from "./minmax";
|
|
7
|
-
export * from "./interval";
|
|
8
|
-
export * from "./common";
|
|
9
|
-
export * from "./average";
|
|
10
|
-
export * from "./read_processed_details";
|
|
11
4
|
export { AggregateFunction } from "node-opcua-constants";
|
|
5
|
+
export { addAggregateFunctionSupport, addAggregateStandardFunctionSupport, addAggregateSupport, getAggregateConfiguration, installAggregateConfigurationOptions } from "./aggregates";
|
|
6
|
+
export * from "./average";
|
|
7
|
+
export * from "./common";
|
|
12
8
|
export { getCountData } from "./count";
|
|
13
|
-
export { getPercentGoodData } from "./percent_good";
|
|
14
|
-
export { getPercentBadData } from "./percent_bad";
|
|
15
9
|
export { getDurationBadData } from "./duration_bad";
|
|
16
10
|
export { getDurationGoodData } from "./duration_good";
|
|
11
|
+
export * from "./interpolate";
|
|
12
|
+
export * from "./interval";
|
|
13
|
+
export * from "./minmax";
|
|
14
|
+
export { getPercentBadData } from "./percent_bad";
|
|
15
|
+
export { getPercentGoodData } from "./percent_good";
|
|
16
|
+
export * from "./read_processed_details";
|
package/dist/index.js
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @module node-opca-aggregates
|
|
4
|
+
*/
|
|
2
5
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
6
|
if (k2 === undefined) k2 = k;
|
|
4
7
|
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
@@ -14,32 +17,29 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
17
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
18
|
};
|
|
16
19
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
*/
|
|
20
|
+
exports.getPercentGoodData = exports.getPercentBadData = exports.getDurationGoodData = exports.getDurationBadData = exports.getCountData = exports.installAggregateConfigurationOptions = exports.getAggregateConfiguration = exports.addAggregateSupport = exports.addAggregateStandardFunctionSupport = exports.addAggregateFunctionSupport = exports.AggregateFunction = void 0;
|
|
21
|
+
var node_opcua_constants_1 = require("node-opcua-constants");
|
|
22
|
+
Object.defineProperty(exports, "AggregateFunction", { enumerable: true, get: function () { return node_opcua_constants_1.AggregateFunction; } });
|
|
21
23
|
var aggregates_1 = require("./aggregates");
|
|
24
|
+
Object.defineProperty(exports, "addAggregateFunctionSupport", { enumerable: true, get: function () { return aggregates_1.addAggregateFunctionSupport; } });
|
|
25
|
+
Object.defineProperty(exports, "addAggregateStandardFunctionSupport", { enumerable: true, get: function () { return aggregates_1.addAggregateStandardFunctionSupport; } });
|
|
22
26
|
Object.defineProperty(exports, "addAggregateSupport", { enumerable: true, get: function () { return aggregates_1.addAggregateSupport; } });
|
|
23
|
-
Object.defineProperty(exports, "installAggregateConfigurationOptions", { enumerable: true, get: function () { return aggregates_1.installAggregateConfigurationOptions; } });
|
|
24
27
|
Object.defineProperty(exports, "getAggregateConfiguration", { enumerable: true, get: function () { return aggregates_1.getAggregateConfiguration; } });
|
|
25
|
-
Object.defineProperty(exports, "
|
|
26
|
-
Object.defineProperty(exports, "addAggregateFunctionSupport", { enumerable: true, get: function () { return aggregates_1.addAggregateFunctionSupport; } });
|
|
27
|
-
__exportStar(require("./interpolate"), exports);
|
|
28
|
-
__exportStar(require("./minmax"), exports);
|
|
29
|
-
__exportStar(require("./interval"), exports);
|
|
30
|
-
__exportStar(require("./common"), exports);
|
|
28
|
+
Object.defineProperty(exports, "installAggregateConfigurationOptions", { enumerable: true, get: function () { return aggregates_1.installAggregateConfigurationOptions; } });
|
|
31
29
|
__exportStar(require("./average"), exports);
|
|
32
|
-
__exportStar(require("./
|
|
33
|
-
var node_opcua_constants_1 = require("node-opcua-constants");
|
|
34
|
-
Object.defineProperty(exports, "AggregateFunction", { enumerable: true, get: function () { return node_opcua_constants_1.AggregateFunction; } });
|
|
30
|
+
__exportStar(require("./common"), exports);
|
|
35
31
|
var count_1 = require("./count");
|
|
36
32
|
Object.defineProperty(exports, "getCountData", { enumerable: true, get: function () { return count_1.getCountData; } });
|
|
37
|
-
var percent_good_1 = require("./percent_good");
|
|
38
|
-
Object.defineProperty(exports, "getPercentGoodData", { enumerable: true, get: function () { return percent_good_1.getPercentGoodData; } });
|
|
39
|
-
var percent_bad_1 = require("./percent_bad");
|
|
40
|
-
Object.defineProperty(exports, "getPercentBadData", { enumerable: true, get: function () { return percent_bad_1.getPercentBadData; } });
|
|
41
33
|
var duration_bad_1 = require("./duration_bad");
|
|
42
34
|
Object.defineProperty(exports, "getDurationBadData", { enumerable: true, get: function () { return duration_bad_1.getDurationBadData; } });
|
|
43
35
|
var duration_good_1 = require("./duration_good");
|
|
44
36
|
Object.defineProperty(exports, "getDurationGoodData", { enumerable: true, get: function () { return duration_good_1.getDurationGoodData; } });
|
|
37
|
+
__exportStar(require("./interpolate"), exports);
|
|
38
|
+
__exportStar(require("./interval"), exports);
|
|
39
|
+
__exportStar(require("./minmax"), exports);
|
|
40
|
+
var percent_bad_1 = require("./percent_bad");
|
|
41
|
+
Object.defineProperty(exports, "getPercentBadData", { enumerable: true, get: function () { return percent_bad_1.getPercentBadData; } });
|
|
42
|
+
var percent_good_1 = require("./percent_good");
|
|
43
|
+
Object.defineProperty(exports, "getPercentGoodData", { enumerable: true, get: function () { return percent_good_1.getPercentGoodData; } });
|
|
44
|
+
__exportStar(require("./read_processed_details"), exports);
|
|
45
45
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;AAEH,6DAAyD;AAAhD,yHAAA,iBAAiB,OAAA;AAC1B,2CAMsB;AALlB,yHAAA,2BAA2B,OAAA;AAC3B,iIAAA,mCAAmC,OAAA;AACnC,iHAAA,mBAAmB,OAAA;AACnB,uHAAA,yBAAyB,OAAA;AACzB,kIAAA,oCAAoC,OAAA;AAExC,4CAA0B;AAC1B,2CAAyB;AACzB,iCAAuC;AAA9B,qGAAA,YAAY,OAAA;AACrB,+CAAoD;AAA3C,kHAAA,kBAAkB,OAAA;AAC3B,iDAAsD;AAA7C,oHAAA,mBAAmB,OAAA;AAC5B,gDAA8B;AAC9B,6CAA2B;AAC3B,2CAAyB;AACzB,6CAAkD;AAAzC,gHAAA,iBAAiB,OAAA;AAC1B,+CAAoD;AAA3C,kHAAA,kBAAkB,OAAA;AAC3B,2DAAyC"}
|
package/dist/interpolate.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module node-opcua-aggregates
|
|
3
3
|
*/
|
|
4
|
-
import { UAVariable } from "node-opcua-address-space";
|
|
4
|
+
import type { UAVariable } from "node-opcua-address-space";
|
|
5
5
|
import { DataValue } from "node-opcua-data-value";
|
|
6
|
-
import { AggregateConfigurationOptionsEx, Interval } from "./interval";
|
|
6
|
+
import { type AggregateConfigurationOptionsEx, type Interval } from "./interval";
|
|
7
7
|
export declare function interpolatedValue(interval: Interval, options: AggregateConfigurationOptionsEx): DataValue;
|
|
8
8
|
/**
|
|
9
9
|
*
|
package/dist/interpolate.js
CHANGED
|
@@ -19,9 +19,9 @@ const interval_1 = require("./interval");
|
|
|
19
19
|
*/
|
|
20
20
|
function interpolatedValue(interval, options) {
|
|
21
21
|
options = (0, interval_1.adjustProcessingOptions)(options);
|
|
22
|
-
(0, node_opcua_assert_1.assert)(Object.
|
|
23
|
-
(0, node_opcua_assert_1.assert)(Object.
|
|
24
|
-
const bTreatUncertainAsBad = options.treatUncertainAsBad;
|
|
22
|
+
(0, node_opcua_assert_1.assert)(Object.hasOwn(options, "useSlopedExtrapolation"));
|
|
23
|
+
(0, node_opcua_assert_1.assert)(Object.hasOwn(options, "treatUncertainAsBad"));
|
|
24
|
+
const bTreatUncertainAsBad = options.treatUncertainAsBad || false;
|
|
25
25
|
const steppedValue = (previousDataValue) => {
|
|
26
26
|
if (!previousDataValue.statusCode) {
|
|
27
27
|
throw new Error("Expecting statusCode");
|
|
@@ -56,7 +56,6 @@ function interpolatedValue(interval, options) {
|
|
|
56
56
|
}
|
|
57
57
|
// else interpolate
|
|
58
58
|
const interpVal = (0, common_1.interpolateValue)(prev2.dataValue, prev1.dataValue, interval.startTime);
|
|
59
|
-
// 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
61
|
const mask = 0x0000ffffff;
|
|
@@ -106,7 +105,6 @@ function interpolatedValue(interval, options) {
|
|
|
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
107
|
if (before.index + 1 < next.index || !next.dataValue.statusCode.isGood() || !before.dataValue.statusCode.isGood()) {
|
|
109
|
-
// tslint:disable:no-bitwise
|
|
110
108
|
// some bad data exist in between = change status code
|
|
111
109
|
const mask = 0x0000ffffff;
|
|
112
110
|
const extraBits = interpolatedDataValue.statusCode.value & mask;
|
package/dist/interpolate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interpolate.js","sourceRoot":"","sources":["../source/interpolate.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"interpolate.js","sourceRoot":"","sources":["../source/interpolate.ts"],"names":[],"mappings":"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"}
|