Added sanitizing of input for handleInput for rotating machine

src/nodeClass.js

@@ -114,8 +114,8 @@ class nodeClass {
     try {
           const mode = m.currentMode;
           const state = m.state.getCurrentState();
-          const flow = Math.round(m.measurements.type("flow").variant("predicted").position('downstream').getCurrentValue());
+          const flow = Math.round(m.measurements.type("flow").variant("predicted").position('downstream').getCurrentValue('m3/h'));
-          const power = Math.round(m.measurements.type("power").variant("predicted").position('upstream').getCurrentValue());
+          const power = Math.round(m.measurements.type("power").variant("predicted").position('atequipment').getCurrentValue('kW'));
           let symbolState;
           switch(state){
             case "off":

src/specificClass.js

@@ -48,7 +48,17 @@ class Machine {
     this.errorMetrics = new nrmse(errorMetricsConfig, this.logger);
 
     // Initialize measurements
-    this.measurements = new MeasurementContainer();
+    this.measurements = new MeasurementContainer({
+      autoConvert: true,
+      windowSize: 50,
+      defaultUnits: {
+        pressure: 'mbar',
+        flow: this.config.general.unit,
+        power: 'kW',
+        temperature: 'C'
+      }
+    });
+
     this.interpolation = new interpolation();
 
     this.flowDrift = null;
@@ -68,11 +78,25 @@ class Machine {
       this.updatePosition();
     });
 
+    //When state changes look if we need to do other updates
+    this.state.emitter.on("stateChange", (newState) => {
+      this.logger.debug(`State change detected: ${newState}`);
+      this._updateState();
+    });
+
     this.child = {}; // object to hold child information so we know on what to subscribe
     this.childRegistrationUtils = new childRegistrationUtils(this); // Child registration utility
 
   }
 
+  _updateState(){
+    const isOperational = this._isOperationalState();
+    if(!isOperational){
+      //overrule the last prediction this should be 0 now
+      this.measurements.type("flow").variant("predicted").position("downstream").value(0);
+    }
+  }
+
   /*-------------------               Register child events               -------------------*/
   registerChild(child, softwareType) {
     this.logger.debug('Setting up child event for softwaretype ' + softwareType);
@@ -175,6 +199,11 @@ _callMeasurementHandler(measurementType, value, position, context) {
 
   async handleInput(source, action, parameter) {
 
+    //sanitize input
+    if( typeof action !== 'string'){this.logger.error(`Action must be string`); return;}
+    //convert to lower case to avoid to many mistakes in commands
+    action = action.toLowerCase();
+
     if (!this.isValidSourceForMode(source, this.currentMode)) {
       let warningTxt = `Source '${source}' is not valid for mode '${this.currentMode}'.`;
       this.logger.warn(warningTxt);
@@ -185,23 +214,24 @@ _callMeasurementHandler(measurementType, value, position, context) {
     
     try {
       switch (action) {
-        case "execSequence":
+
+        case "execsequence":
           return await this.executeSequence(parameter);
 
-        case "execMovement":
+        case "execmovement":
           return await this.setpoint(parameter);
 
-        case "flowMovement":
+        case "flowmovement":
           // Calculate the control value for a desired flow
           const pos = this.calcCtrl(parameter);
           // Move to the desired setpoint
           return await this.setpoint(pos);
 
-        case "emergencyStop":
+        case "emergencystop":
           this.logger.warn(`Emergency stop activated by '${source}'.`);
           return await this.executeSequence("emergencyStop");
 
-        case "statusCheck":
+        case "statuscheck":
           this.logger.info(`Status Check: Mode = '${this.currentMode}', Source = '${source}'.`);
           break;
 
@@ -501,13 +531,14 @@ _callMeasurementHandler(measurementType, value, position, context) {
     
     // Update predicted flow if you have prediction capability
     if (this.predictFlow) {
-      this.measurements.type("flow").variant("predicted").position("atEquipment").value(this.predictFlow.outputY || 0);
+      this.measurements.type("flow").variant("predicted").position("downstream").value(this.predictFlow.outputY || 0);
     }
   }
 
   // Helper method for operational state check
   _isOperationalState() {
     const state = this.state.getCurrentState();
+    this.logger.debug(`Checking operational state ${this.state.getCurrentState()} ? ${["operational", "accelerating", "decelerating"].includes(state)}`);
     return ["operational", "accelerating", "decelerating"].includes(state);
   }
 
@@ -531,6 +562,9 @@ _callMeasurementHandler(measurementType, value, position, context) {
       this.calcDistanceBEP(efficiency,cog,minEfficiency);
 
     }
+
+    
+
   }
 
   calcDistanceFromPeak(currentEfficiency,peakEfficiency){
@@ -561,7 +595,6 @@ _callMeasurementHandler(measurementType, value, position, context) {
     };
   }
 
-
    // Calculate the center of gravity for current pressure
   calcCog() {
 
@@ -677,23 +710,12 @@ _callMeasurementHandler(measurementType, value, position, context) {
 
     // Improved output object generation
     const output = {};
-    //build the output object
-    this.measurements.getTypes().forEach(type => {
-      this.measurements.getVariants(type).forEach(variant => {
 
-        const downstreamVal = this.measurements.type(type).variant(variant).position("downstream").getCurrentValue();
+    Object.entries(this.measurements.measurements).forEach(([type, variants]) => {
-        const upstreamVal = this.measurements.type(type).variant(variant).position("upstream").getCurrentValue();
+      Object.entries(variants).forEach(([variant, positions]) => {
-
+        Object.entries(positions).forEach(([position, measurement]) => {
-        if (downstreamVal != null) {
+          output[`${type}.${variant}.${position}`] = measurement.getCurrentValue();
-          output[`downstream_${variant}_${type}`] = downstreamVal;
+        });
-        }
-        if (upstreamVal != null) {
-          output[`upstream_${variant}_${type}`] = upstreamVal;
-        }
-        if (downstreamVal != null && upstreamVal != null) {
-          const diffVal = this.measurements.type(type).variant(variant).difference().value;
-          output[`differential_${variant}_${type}`] = diffVal;
-        }
       });
     });
 
@@ -706,6 +728,7 @@ _callMeasurementHandler(measurementType, value, position, context) {
     output["cog"] = this.cog; // flow / power efficiency
     output["NCog"] = this.NCog; // normalized cog
     output["NCogPercent"] = Math.round(this.NCog * 100 * 100) / 100 ;
+    output["maintenanceTime"] = this.state.getMaintenanceTimeHours();
 
     if(this.flowDrift != null){
       const flowDrift = this.flowDrift;