@machinemetrics/io-adapter-lib 2.35.0 → 2.35.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [2.35.1]
+- Fixed value-increase and value-decrease to not emit true when coming back from UNAVAILABLE
+- Behavior change: value-decrease does not emit true on start
+
 ## [2.35.0]
 - Added data-events config support
 

package/lib/transform/valueDecrease.js

@@ -25,7 +25,7 @@ class ValueDecreaseFilter extends TransformState {
   }
 
   emitUpdate(context) {
-    if (this.forceEmit || (this.value < this.previousValue && this.valueTime === this.lastSampleTime)) {
+    if (this.value < this.previousValue && this.valueTime === this.lastSampleTime) {
       this.forceEmit = false;
       this.lastEmitValue = this.value;
       this.lastEmitTime = this.lastSampleTime;
@@ -33,6 +33,14 @@ class ValueDecreaseFilter extends TransformState {
     }
     this.emit('update', false, this.lastSampleTime, context);
   }
+
+  setUnavailable(context, time) {
+    this.available = false;
+    this.previousValue = this.value;
+    this.previousValueTime = this.valueTime;
+    this.valueTime = time;
+    this.emit('unavailable', time, context);
+  }
 }
 
 module.exports = ValueDecreaseFilter;

package/lib/transform/valueIncrease.js

@@ -25,7 +25,7 @@ class ValueIncreaseFilter extends TransformState {
   }
 
   emitUpdate(context) {
-    if (this.forceEmit || (this.value > this.previousValue && this.valueTime === this.lastSampleTime)) {
+    if (this.value > this.previousValue && this.valueTime === this.lastSampleTime) {
       this.forceEmit = false;
       this.lastEmitValue = this.value;
       this.lastEmitTime = this.lastSampleTime;
@@ -33,6 +33,14 @@ class ValueIncreaseFilter extends TransformState {
     }
     this.emit('update', false, this.lastSampleTime, context);
   }
+
+  setUnavailable(context, time) {
+    this.available = false;
+    this.previousValue = this.value;
+    this.previousValueTime = this.valueTime;
+    this.valueTime = time;
+    this.emit('unavailable', time, context);
+  }
 }
 
 module.exports = ValueIncreaseFilter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@machinemetrics/io-adapter-lib",
-  "version": "2.35.0",
+  "version": "2.35.1",
   "description": "Configuration and engine implementation for MachineMetrics AdapterScripts and adapters",
   "main": "index.js",
   "license": "UNLICENSED",

package/test/configFiles/transform/value-decrease.yml

@@ -0,0 +1,10 @@
+version: 2
+device: mtconnect-adapter
+endpoint: localhost:8001
+mtconnect-port: 8002
+declare-keys:
+  - level
+variables:
+  decreased:
+    - source: level
+    - value-decrease

package/test/configFiles/transform/value-increase.yml

@@ -0,0 +1,10 @@
+version: 2
+device: mtconnect-adapter
+endpoint: localhost:8001
+mtconnect-port: 8002
+declare-keys:
+  - level
+variables:
+  increased:
+    - source: level
+    - value-increase

package/test/transform/valueDecrease.test.js

@@ -1,6 +1,8 @@
 'use strict';
 
 const ValueDecrease = require('../../lib/transform').valueDecrease;
+const EngineV2 = require('../../lib/engine/engineV2');
+const Builder = require('../../lib/engine/transformBuilderV2');
 const testUtils = require('../util/testUtils');
 
 describe('value-decrease transform tests', function () {
@@ -12,7 +14,7 @@ describe('value-decrease transform tests', function () {
       [1, 2], [1, 4], [2, 6], [4, 10], [0, 14], [1, 15], [3, 16], [1, 21],
     ]);
     filter.validate([
-      [true, 2], [false, 2], [false, 4], [false, 6], [false, 10], [true, 14], [false, 14],
+      [false, 2], [false, 4], [false, 6], [false, 10], [true, 14], [false, 14],
       [false, 15], [false, 16], [true, 21], [false, 21],
     ]);
   });
@@ -25,8 +27,33 @@ describe('value-decrease transform tests', function () {
       ['1', 2], ['1', 4], ['2', 6], ['10', 10], ['0', 14], ['1', 15], ['3', 16], ['1', 21],
     ]);
     filter.validate([
-      [true, 2], [false, 2], [false, 4], [false, 6], [false, 10], [true, 14], [false, 14],
+      [false, 2], [false, 4], [false, 6], [false, 10], [true, 14], [false, 14],
       [false, 15], [false, 16], [true, 21], [false, 21],
     ]);
   });
 });
+
+describe('value-decrease full engine config file tests', function () {
+  let config;
+  before(async function () {
+    config = await testUtils.loadConfig('transform/value-decrease.yml');
+  });
+
+  it('does not emit true when source sends UNAVAILABLE', function () {
+    const engine = new EngineV2(config);
+    const builder = new Builder(config);
+    builder.build(engine);
+
+    const source = testUtils.valueSource();
+    testUtils.attachEngineTransformValidator(engine, engine.variablePool.decreased, source);
+
+    source.sendValues('level', [
+      [1, 0], [2, 1], [0, 2], [1, 3], [2, 4], ['UNAVAILABLE', 5], [3, 6],
+    ]);
+
+    engine.validateFilter([
+      [false, 0], [false, 1], [true, 2], [false, 2], [false, 3], [false, 4],
+      [false, 6],
+    ]);
+  });
+});

package/test/transform/valueIncrease.test.js

@@ -1,6 +1,8 @@
 'use strict';
 
 const ValueIncrease = require('../../lib/transform').valueIncrease;
+const EngineV2 = require('../../lib/engine/engineV2');
+const Builder = require('../../lib/engine/transformBuilderV2');
 const testUtils = require('../util/testUtils');
 
 describe('value-increase transform tests', function () {
@@ -30,3 +32,28 @@ describe('value-increase transform tests', function () {
     ]);
   });
 });
+
+describe('value-increase full engine config file tests', function () {
+  let config;
+  before(async function () {
+    config = await testUtils.loadConfig('transform/value-increase.yml');
+  });
+
+  it('does not emit true when source sends UNAVAILABLE', function () {
+    const engine = new EngineV2(config);
+    const builder = new Builder(config);
+    builder.build(engine);
+
+    const source = testUtils.valueSource();
+    testUtils.attachEngineTransformValidator(engine, engine.variablePool.increased, source);
+
+    source.sendValues('level', [
+      [1, 0], [2, 1], [0, 2], [1, 3], [2, 4], ['UNAVAILABLE', 5], [2, 6], [3, 7],
+    ]);
+
+    engine.validateFilter([
+      [true, 0], [false, 0], [true, 1], [false, 1], [false, 2], [true, 3], [false, 3],
+      [true, 4], [false, 4], [false, 6], [true, 7], [false, 7],
+    ]);
+  });
+});