node-opcua-service-subscription 2.85.0 → 2.86.1

package/dist/deadband_checker.d.ts

@@ -24,4 +24,4 @@ export declare function isOutsideDeadbandAbsolute(variant1: Variant, variant2: V
  * @method isOutsideDeadband
  * @return true if the element is outside deadBand
  */
-export declare function isOutsideDeadbandPercent(variant1: Variant, variant2: Variant, deadbandValue: number, range: PseudoRange): boolean;
+export declare function isOutsideDeadbandPercent(variant1: Variant, variant2: Variant, deadbandValuePercent: number, range: PseudoRange): boolean;

package/dist/deadband_checker.js

@@ -45,7 +45,10 @@ function _isOutsideDeadbandScalar(value1, value2, dataType, absoluteDeadband) {
 }
 function isOutsideDeadbandVariant(v1, v2, absoluteDeadBand) {
     (0, node_opcua_assert_1.assert)(isFinite(absoluteDeadBand));
-    if (v1.arrayType === node_opcua_variant_1.VariantArrayType.Array) {
+    if (v1.arrayType === node_opcua_variant_1.VariantArrayType.Array || v1.arrayType === node_opcua_variant_1.VariantArrayType.Matrix) {
+        // If the Value of the MonitoredItem is an array, then the deadband calculation logic shall be applied to
+        // each element of the array. If an element that requires a DataChange is found, then no further
+        // deadband checking is necessary and the entire array shall be returned.
         if (v1.dataType !== v2.dataType) {
             return true;
         }
@@ -69,40 +72,46 @@ function isOutsideDeadbandVariant(v1, v2, absoluteDeadBand) {
         return _isOutsideDeadbandScalar(v1.value, v2.value, v1.dataType, absoluteDeadBand);
     }
 }
-function isOnEdgeOfRangeScalar(currentValue, newValue, dataType, range) {
-    if (dataType === node_opcua_variant_1.DataType.UInt64 || dataType === node_opcua_variant_1.DataType.Int64) {
-        // istanbul ignore next
-        if (!(currentValue instanceof Array && newValue instanceof Array)) {
-            throw new Error("Invalid");
-        }
-        currentValue = currentValue[1];
-        newValue = newValue[1];
-    }
-    if ( /*currentValue !== range.low && */newValue <= range.low) {
-        return true;
-    }
-    if ( /*currentValue !== range.high && */newValue >= range.high) {
-        return true;
-    }
-    return false;
-}
-function isOnEdgeOfRange(currentValue, newValue, range) {
-    if (currentValue.arrayType === node_opcua_variant_1.VariantArrayType.Array) {
-        const n = currentValue.value.length;
-        let i = 0;
-        for (i = 0; i < n; i++) {
-            if (isOnEdgeOfRangeScalar(currentValue.value[i], newValue.value[i], newValue.dataType, range)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    else {
-        (0, node_opcua_assert_1.assert)(currentValue.arrayType === node_opcua_variant_1.VariantArrayType.Scalar);
-        (0, node_opcua_assert_1.assert)(currentValue.dataType === newValue.dataType);
-        return isOnEdgeOfRangeScalar(currentValue.value, newValue.value, currentValue.dataType, range);
-    }
-}
+// function isOnEdgeOfRangeScalar(
+//     currentValue: NumberType,
+//     newValue: NumberType,
+//     dataType: DataType,
+//     range: PseudoRange,
+//     deadbandValue: number
+// ): boolean {
+//     if (dataType === DataType.UInt64 || dataType === DataType.Int64) {
+//         // istanbul ignore next
+//         if (!(currentValue instanceof Array && newValue instanceof Array)) {
+//             throw new Error("Invalid");
+//         }
+//         currentValue = currentValue[1];
+//         newValue = newValue[1];
+//     }
+//     if (Array.isArray(newValue)) throw new Error("internal error");
+//     if (/*currentValue !== range.low && */ Math.abs(newValue - range.low) < deadbandValue) {
+//         return true;
+//     }
+//     if (/*currentValue !== range.high && */ Math.abs(newValue - range.high) < deadbandValue) {
+//         return true;
+//     }
+//     return false;
+// }
+// function isOnEdgeOfRange(currentValue: Variant, newValue: Variant, range: PseudoRange, deadbandValue: number): boolean {
+//     if (currentValue.arrayType === VariantArrayType.Array) {
+//         const n = currentValue.value.length;
+//         let i = 0;
+//         for (i = 0; i < n; i++) {
+//             if (isOnEdgeOfRangeScalar(currentValue.value[i], newValue.value[i], newValue.dataType, range, deadbandValue)) {
+//                 return true;
+//             }
+//         }
+//         return false;
+//     } else {
+//         assert(currentValue.arrayType === VariantArrayType.Scalar);
+//         assert(currentValue.dataType === newValue.dataType);
+//         return isOnEdgeOfRangeScalar(currentValue.value, newValue.value, currentValue.dataType, range, deadbandValue);
+//     }
+// }
 /**
  * @method isOutsideDeadbandNone
  * @return true if the element is in deadBand
@@ -125,12 +134,7 @@ exports.isOutsideDeadbandAbsolute = isOutsideDeadbandAbsolute;
  * @method isOutsideDeadband
  * @return true if the element is outside deadBand
  */
-function isOutsideDeadbandPercent(variant1, variant2, deadbandValue, range) {
-    // The range of the deadbandValue is from 0.0 to 100.0 Percent.
-    (0, node_opcua_assert_1.assert)(deadbandValue >= 0 && deadbandValue <= 100);
-    if (isOnEdgeOfRange(variant1, variant2, range)) {
-        return true;
-    }
+function isOutsideDeadbandPercent(variant1, variant2, deadbandValuePercent, range) {
     // DeadbandType = PercentDeadband
     // For this type of deadband the deadbandValue is defined as the percentage of the EURange. That is,
     // it applies only to AnalogItems with an EURange Property that defines the typical value range for the
@@ -140,15 +144,14 @@ function isOutsideDeadbandPercent(variant1, variant2, deadbandValue, range) {
     //      DataChange if (absolute value of (last cached value - current value) >
     //                                          (deadbandValue/100.0) * ((high-low) of EURange)))
     //
-    // Specifying a deadbandValue outside of this range will be rejected and reported with the
-    // StatusCode BadDeadbandFilterInvalid (see Table 27).
-    // If the Value of the MonitoredItem is an array, then the deadband calculation logic shall be applied to
-    // each element of the array. If an element that requires a DataChange is found, then no further
-    // deadband checking is necessary and the entire array shall be returned.
+    // The range of the deadbandValue is from 0.0 to 100.0 Percent.
+    (0, node_opcua_assert_1.assert)(deadbandValuePercent >= 0 && deadbandValuePercent <= 100);
     const valueRange = Math.abs(range.high - range.low);
-    (0, node_opcua_assert_1.assert)(typeof valueRange === "number");
-    const value = (deadbandValue / 100) * valueRange;
-    return isOutsideDeadbandAbsolute(variant1, variant2, value);
+    const deadBandValueAbsolute = (deadbandValuePercent / 100.0) * valueRange;
+    // if (isOnEdgeOfRange(variant1, variant2, range, deadBandValueAbsolute)) {
+    //     return true;
+    // }
+    return isOutsideDeadbandAbsolute(variant1, variant2, deadBandValueAbsolute);
 }
 exports.isOutsideDeadbandPercent = isOutsideDeadbandPercent;
 //# sourceMappingURL=deadband_checker.js.map

package/dist/deadband_checker.js.map

@@ -1 +1 @@
-{"version":3,"file":"deadband_checker.js","sourceRoot":"","sources":["../source/deadband_checker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deadband_checker.js","sourceRoot":"","sources":["../source/deadband_checker.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-service-subscription",
-    "version": "2.85.0",
+    "version": "2.86.1",
     "description": "pure nodejs OPCUA SDK - module -service-subscription",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -12,17 +12,17 @@
     },
     "dependencies": {
         "node-opcua-assert": "2.77.0",
-        "node-opcua-types": "2.85.0",
-        "node-opcua-variant": "2.85.0"
+        "node-opcua-types": "2.86.1",
+        "node-opcua-variant": "2.86.1"
     },
     "devDependencies": {
-        "node-opcua-buffer-utils": "2.85.0",
-        "node-opcua-debug": "2.85.0",
-        "node-opcua-nodeid": "2.85.0",
-        "node-opcua-packet-analyzer": "2.85.0",
-        "node-opcua-secure-channel": "2.85.0",
-        "node-opcua-service-read": "2.85.0",
-        "node-opcua-status-code": "2.85.0",
+        "node-opcua-buffer-utils": "2.86.0",
+        "node-opcua-debug": "2.86.0",
+        "node-opcua-nodeid": "2.86.0",
+        "node-opcua-packet-analyzer": "2.86.1",
+        "node-opcua-secure-channel": "2.86.1",
+        "node-opcua-service-read": "2.86.1",
+        "node-opcua-status-code": "2.86.1",
         "should": "^13.2.3"
     },
     "author": "Etienne Rossignon",
@@ -40,5 +40,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "68498fcf7b20ea9f7bd66e8529c546221daf5d52"
+    "gitHead": "389ba18585ff4b62f6fee58b69bd871a8e6b0dff"
 }

package/source/deadband_checker.ts

@@ -54,7 +54,10 @@ function _isOutsideDeadbandScalar(value1: NumberType, value2: NumberType, dataTy
 function isOutsideDeadbandVariant(v1: Variant, v2: Variant, absoluteDeadBand: number): boolean {
     assert(isFinite(absoluteDeadBand));
 
-    if (v1.arrayType === VariantArrayType.Array) {
+    if (v1.arrayType === VariantArrayType.Array || v1.arrayType === VariantArrayType.Matrix) {
+        // If the Value of the MonitoredItem is an array, then the deadband calculation logic shall be applied to
+        // each element of the array. If an element that requires a DataChange is found, then no further
+        // deadband checking is necessary and the entire array shall be returned.
         if (v1.dataType !== v2.dataType) {
             return true;
         }
@@ -72,46 +75,53 @@ function isOutsideDeadbandVariant(v1: Variant, v2: Variant, absoluteDeadBand: nu
         return false;
     } else {
         assert(v1.arrayType === VariantArrayType.Scalar);
-        if(v1.dataType !== v2.dataType) {
+        if (v1.dataType !== v2.dataType) {
             return true;
         }
         return _isOutsideDeadbandScalar(v1.value, v2.value, v1.dataType, absoluteDeadBand);
     }
 }
-function isOnEdgeOfRangeScalar(currentValue: NumberType, newValue: NumberType, dataType: DataType, range: PseudoRange): boolean {
-    if (dataType === DataType.UInt64 || dataType === DataType.Int64) {
-        // istanbul ignore next
-        if (!(currentValue instanceof Array && newValue instanceof Array)) {
-            throw new Error("Invalid");
-        }
-        currentValue = currentValue[1];
-        newValue = newValue[1];
-    }
-    if (/*currentValue !== range.low && */ newValue <= range.low) {
-        return true;
-    }
-    if (/*currentValue !== range.high && */ newValue >= range.high) {
-        return true;
-    }
-    return false;
-}
+// function isOnEdgeOfRangeScalar(
+//     currentValue: NumberType,
+//     newValue: NumberType,
+//     dataType: DataType,
+//     range: PseudoRange,
+//     deadbandValue: number
+// ): boolean {
+//     if (dataType === DataType.UInt64 || dataType === DataType.Int64) {
+//         // istanbul ignore next
+//         if (!(currentValue instanceof Array && newValue instanceof Array)) {
+//             throw new Error("Invalid");
+//         }
+//         currentValue = currentValue[1];
+//         newValue = newValue[1];
+//     }
+//     if (Array.isArray(newValue)) throw new Error("internal error");
+//     if (/*currentValue !== range.low && */ Math.abs(newValue - range.low) < deadbandValue) {
+//         return true;
+//     }
+//     if (/*currentValue !== range.high && */ Math.abs(newValue - range.high) < deadbandValue) {
+//         return true;
+//     }
+//     return false;
+// }
 
-function isOnEdgeOfRange(currentValue: Variant, newValue: Variant, range: PseudoRange): boolean {
-    if (currentValue.arrayType === VariantArrayType.Array) {
-        const n = currentValue.value.length;
-        let i = 0;
-        for (i = 0; i < n; i++) {
-            if (isOnEdgeOfRangeScalar(currentValue.value[i], newValue.value[i], newValue.dataType, range)) {
-                return true;
-            }
-        }
-        return false;
-    } else {
-        assert(currentValue.arrayType === VariantArrayType.Scalar);
-        assert(currentValue.dataType === newValue.dataType);
-        return isOnEdgeOfRangeScalar(currentValue.value, newValue.value, currentValue.dataType, range);
-    }
-}
+// function isOnEdgeOfRange(currentValue: Variant, newValue: Variant, range: PseudoRange, deadbandValue: number): boolean {
+//     if (currentValue.arrayType === VariantArrayType.Array) {
+//         const n = currentValue.value.length;
+//         let i = 0;
+//         for (i = 0; i < n; i++) {
+//             if (isOnEdgeOfRangeScalar(currentValue.value[i], newValue.value[i], newValue.dataType, range, deadbandValue)) {
+//                 return true;
+//             }
+//         }
+//         return false;
+//     } else {
+//         assert(currentValue.arrayType === VariantArrayType.Scalar);
+//         assert(currentValue.dataType === newValue.dataType);
+//         return isOnEdgeOfRangeScalar(currentValue.value, newValue.value, currentValue.dataType, range, deadbandValue);
+//     }
+// }
 
 /**
  * @method isOutsideDeadbandNone
@@ -134,14 +144,7 @@ export function isOutsideDeadbandAbsolute(variant1: Variant, variant2: Variant,
  * @method isOutsideDeadband
  * @return true if the element is outside deadBand
  */
-export function isOutsideDeadbandPercent(variant1: Variant, variant2: Variant, deadbandValue: number, range: PseudoRange): boolean {
-    // The range of the deadbandValue is from 0.0 to 100.0 Percent.
-    assert(deadbandValue >= 0 && deadbandValue <= 100);
-
-    if (isOnEdgeOfRange(variant1, variant2, range)) {
-        return true;
-    }
-
+export function isOutsideDeadbandPercent(variant1: Variant, variant2: Variant, deadbandValuePercent: number, range: PseudoRange): boolean {
     // DeadbandType = PercentDeadband
     // For this type of deadband the deadbandValue is defined as the percentage of the EURange. That is,
     // it applies only to AnalogItems with an EURange Property that defines the typical value range for the
@@ -151,13 +154,16 @@ export function isOutsideDeadbandPercent(variant1: Variant, variant2: Variant, d
     //      DataChange if (absolute value of (last cached value - current value) >
     //                                          (deadbandValue/100.0) * ((high-low) of EURange)))
     //
-    // Specifying a deadbandValue outside of this range will be rejected and reported with the
-    // StatusCode BadDeadbandFilterInvalid (see Table 27).
-    // If the Value of the MonitoredItem is an array, then the deadband calculation logic shall be applied to
-    // each element of the array. If an element that requires a DataChange is found, then no further
-    // deadband checking is necessary and the entire array shall be returned.
+
+    // The range of the deadbandValue is from 0.0 to 100.0 Percent.
+    assert(deadbandValuePercent >= 0 && deadbandValuePercent <= 100);
+
     const valueRange = Math.abs(range.high - range.low);
-    assert(typeof valueRange === "number");
-    const value = (deadbandValue / 100) * valueRange;
-    return isOutsideDeadbandAbsolute(variant1, variant2, value);
+    const deadBandValueAbsolute = (deadbandValuePercent / 100.0) * valueRange;
+
+    // if (isOnEdgeOfRange(variant1, variant2, range, deadBandValueAbsolute)) {
+    //     return true;
+    // }
+
+    return isOutsideDeadbandAbsolute(variant1, variant2, deadBandValueAbsolute);
 }