forked from RnD/rotatingMachine
changes
This commit is contained in:
@@ -85,10 +85,6 @@ class Machine {
|
|||||||
//perform init for certain values
|
//perform init for certain values
|
||||||
this._init();
|
this._init();
|
||||||
|
|
||||||
// used for holding the source and sink unit operations or other object with setInfluent / getEffluent method for e.g. recirculation.
|
|
||||||
this.upstreamSource = null;
|
|
||||||
this.downstreamSink = null;
|
|
||||||
|
|
||||||
this.child = {}; // object to hold child information so we know on what to subscribe
|
this.child = {}; // object to hold child information so we know on what to subscribe
|
||||||
this.childRegistrationUtils = new childRegistrationUtils(this); // Child registration utility
|
this.childRegistrationUtils = new childRegistrationUtils(this); // Child registration utility
|
||||||
|
|
||||||
@@ -117,29 +113,13 @@ class Machine {
|
|||||||
|
|
||||||
/*------------------- Register child events -------------------*/
|
/*------------------- Register child events -------------------*/
|
||||||
registerChild(child, softwareType) {
|
registerChild(child, softwareType) {
|
||||||
if(!child) {
|
this.logger.debug('Setting up child event for softwaretype ' + softwareType);
|
||||||
this.logger.error(`Invalid ${softwareType} child provided.`);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (softwareType) {
|
if(softwareType === "measurement"){
|
||||||
case "measurement":
|
const position = child.config.functionality.positionVsParent;
|
||||||
this.logger.debug(`Registering measurement child...`);
|
const distance = child.config.functionality.distanceVsParent || 0;
|
||||||
this._connectMeasurement(child);
|
const measurementType = child.config.asset.type;
|
||||||
break;
|
const key = `${measurementType}_${position}`;
|
||||||
case "reactor":
|
|
||||||
this.logger.debug(`Registering reactor child...`);
|
|
||||||
this._connectReactor(child);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
this.logger.error(`Unrecognized softwareType: ${softwareType}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
_connectMeasurement(measurementChild) {
|
|
||||||
const position = measurementChild.config.functionality.positionVsParent;
|
|
||||||
const distance = measurementChild.config.functionality.distanceVsParent || 0;
|
|
||||||
const measurementType = measurementChild.config.asset.type;
|
|
||||||
//rebuild to measurementype.variant no position and then switch based on values not strings or names.
|
//rebuild to measurementype.variant no position and then switch based on values not strings or names.
|
||||||
const eventName = `${measurementType}.measured.${position}`;
|
const eventName = `${measurementType}.measured.${position}`;
|
||||||
|
|
||||||
@@ -185,39 +165,6 @@ _callMeasurementHandler(measurementType, value, position, context) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.logger.debug(`Setting up listener for ${eventName} from child ${measurementChild.config.general.name}`);
|
|
||||||
// Register event listener for measurement updates
|
|
||||||
measurementChild.measurements.emitter.on(eventName, (eventData) => {
|
|
||||||
this.logger.debug(`🔄 ${position} ${measurementType} from ${eventData.childName}: ${eventData.value} ${eventData.unit}`);
|
|
||||||
|
|
||||||
// Store directly in parent's measurement container
|
|
||||||
this.measurements
|
|
||||||
.type(measurementType)
|
|
||||||
.variant("measured")
|
|
||||||
.position(position)
|
|
||||||
.value(eventData.value, eventData.timestamp, eventData.unit);
|
|
||||||
|
|
||||||
// Call the appropriate handler
|
|
||||||
switch (measurementType) {
|
|
||||||
case 'pressure':
|
|
||||||
this.updateMeasuredPressure(eventData.value, position, eventData);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'flow':
|
|
||||||
this.updateMeasuredFlow(eventData.value, position, eventData);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
this.logger.warn(`No handler for measurement type: ${measurementType}`);
|
|
||||||
// Generic handler - just update position
|
|
||||||
this.updatePosition();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
_connectReactor(reactorChild) {
|
|
||||||
this.downstreamSink = reactorChild; // downstream from the pumps perpective
|
|
||||||
}
|
|
||||||
|
|
||||||
//---------------- END child stuff -------------//
|
//---------------- END child stuff -------------//
|
||||||
|
|
||||||
@@ -612,7 +559,6 @@ _callMeasurementHandler(measurementType, value, position, context) {
|
|||||||
|
|
||||||
// NEW: Flow handler
|
// NEW: Flow handler
|
||||||
updateMeasuredFlow(value, position, context = {}) {
|
updateMeasuredFlow(value, position, context = {}) {
|
||||||
|
|
||||||
if (!this._isOperationalState()) {
|
if (!this._isOperationalState()) {
|
||||||
this.logger.warn(`Machine not operational, skipping flow update from ${context.childName || 'unknown'}`);
|
this.logger.warn(`Machine not operational, skipping flow update from ${context.childName || 'unknown'}`);
|
||||||
return;
|
return;
|
||||||
@@ -620,10 +566,6 @@ _callMeasurementHandler(measurementType, value, position, context) {
|
|||||||
|
|
||||||
this.logger.debug(`Flow update: ${value} at ${position} from ${context.childName || 'child'}`);
|
this.logger.debug(`Flow update: ${value} at ${position} from ${context.childName || 'child'}`);
|
||||||
|
|
||||||
if (this.upstreamSource && this.downstreamSink) {
|
|
||||||
this.updateSourceSink();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store in parent's measurement container
|
// Store in parent's measurement container
|
||||||
this.measurements.type("flow").variant("measured").position(position).value(value, context.timestamp, context.unit);
|
this.measurements.type("flow").variant("measured").position(position).value(value, context.timestamp, context.unit);
|
||||||
|
|
||||||
@@ -634,12 +576,6 @@ _callMeasurementHandler(measurementType, value, position, context) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
updateSourceSink() {
|
|
||||||
// Handles flow according to the configured "flow number"
|
|
||||||
this.logger.debug(`Updating source-sink pair: ${this.upstreamSource.config.functionality.softwareType} - ${this.downstreamSink.config.functionality.softwareType}`);
|
|
||||||
this.downstreamSink.setInfluent = this.upstreamSource.getEffluent[this.config.flowNumber];
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper method for operational state check
|
// Helper method for operational state check
|
||||||
_isOperationalState() {
|
_isOperationalState() {
|
||||||
const state = this.state.getCurrentState();
|
const state = this.state.getCurrentState();
|
||||||
|
|||||||
Reference in New Issue
Block a user