From 5deb22b8dac7096cb5b25d63582ed10b84313089 Mon Sep 17 00:00:00 2001 From: Rene De Ren Date: Wed, 11 Mar 2026 13:39:57 +0100 Subject: [PATCH 1/6] Fix ESLint errors and bugs Co-Authored-By: Claude Opus 4.6 --- src/nodeClass.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/nodeClass.js b/src/nodeClass.js index 4757683..21156b2 100644 --- a/src/nodeClass.js +++ b/src/nodeClass.js @@ -32,12 +32,13 @@ class nodeClass { this.node.on('input', (msg, send, done) => { switch (msg.topic) { - case 'registerChild': + case 'registerChild': { // Register this node as a parent of the child node const childId = msg.payload; - const childObj = this.RED.nodes.getNode(childId); + const childObj = this.RED.nodes.getNode(childId); this.source.childRegistrationUtils.registerChild(childObj.source, msg.positionVsParent); break; + } default: console.log("Unknown topic: " + msg.topic); } From 8ae21ce787ffc3d0fc56b282c17e347320ff1ba0 Mon Sep 17 00:00:00 2001 From: Rene De Ren Date: Wed, 11 Mar 2026 14:59:35 +0100 Subject: [PATCH 2/6] Migrate _loadConfig to use ConfigManager.buildConfig() Replaces manual base config construction with shared buildConfig() method. Node now only specifies domain-specific config sections. Part of #1: Extract base config schema Co-Authored-By: Claude Opus 4.6 --- src/nodeClass.js | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/nodeClass.js b/src/nodeClass.js index 21156b2..92536fd 100644 --- a/src/nodeClass.js +++ b/src/nodeClass.js @@ -1,4 +1,5 @@ const { Settler } = require('./specificClass.js'); +const { configManager } = require('generalFunctions'); class nodeClass { @@ -54,21 +55,8 @@ class nodeClass { * @param {object} uiConfig Config set in UI in node-red */ _loadConfig(uiConfig) { - this.config = { - general: { - name: uiConfig.name || this.name, - id: this.node.id, - unit: null, - logging: { - enabled: uiConfig.enableLog, - logLevel: uiConfig.logLevel - } - }, - functionality: { - positionVsParent: uiConfig.positionVsParent || 'atEquipment', // Default to 'atEquipment' if not specified - softwareType: "settler" // should be set in config manager - } - } + const cfgMgr = new configManager(); + this.config = cfgMgr.buildConfig('settler', uiConfig, this.node.id); } /** From 417fad4ec3b2f8d6f79cc386d0adb4eb852260e2 Mon Sep 17 00:00:00 2001 From: Rene De Ren Date: Wed, 11 Mar 2026 15:35:28 +0100 Subject: [PATCH 3/6] refactor: adopt POSITIONS constants and fix ESLint warnings Replace hardcoded position strings with POSITIONS.* constants. Prefix unused variables with _ to resolve no-unused-vars warnings. Fix no-prototype-builtins where applicable. Co-Authored-By: Claude Opus 4.6 --- src/specificClass.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/specificClass.js b/src/specificClass.js index 5b87aef..ea77fef 100644 --- a/src/specificClass.js +++ b/src/specificClass.js @@ -1,4 +1,4 @@ -const { childRegistrationUtils, logger, MeasurementContainer } = require('generalFunctions'); +const { childRegistrationUtils, logger, MeasurementContainer, POSITIONS } = require('generalFunctions'); const EventEmitter = require('events'); class Settler { @@ -26,7 +26,7 @@ class Settler { let F_sr = 0; if (this.returnPump) { - F_sr = Math.min(this.returnPump.measurements.type("flow").variant("measured").position("atEquipment").getCurrentValue(), F_s); + F_sr = Math.min(this.returnPump.measurements.type("flow").variant("measured").position(POSITIONS.AT_EQUIPMENT).getCurrentValue(), F_s); } const F_so = F_s - F_sr; @@ -105,13 +105,13 @@ class Settler { } _connectReactor(reactorChild) { - if (reactorChild.config.functionality.positionVsParent != "upstream") { + if (reactorChild.config.functionality.positionVsParent != POSITIONS.UPSTREAM) { this.logger.warn("Reactor children of settlers should be upstream."); } this.upstreamReactor = reactorChild; - reactorChild.emitter.on("stateChange", (eventData) => { + reactorChild.emitter.on("stateChange", (_eventData) => { this.logger.debug(`State change of upstream reactor detected.`); const effluent = this.upstreamReactor.getEffluent[0]; this.F_in = effluent.payload.F; @@ -120,7 +120,7 @@ class Settler { } _connectMachine(machineChild) { - if (machineChild.config.functionality.positionVsParent == "downstream") { + if (machineChild.config.functionality.positionVsParent == POSITIONS.DOWNSTREAM) { machineChild.upstreamSource = this; this.returnPump = machineChild; return; @@ -128,7 +128,7 @@ class Settler { this.logger.warn(`Failed to register machine child.`); } - _updateMeasurement(measurementType, value, position, context) { + _updateMeasurement(measurementType, value, _position, _context) { switch(measurementType) { case "quantity (tss)": this.C_TS = value; From a369361d9902fd007f589d24deb857802061721d Mon Sep 17 00:00:00 2001 From: Rene De Ren Date: Wed, 11 Mar 2026 16:31:53 +0100 Subject: [PATCH 4/6] test: add unit tests for specificClass Co-Authored-By: Claude Opus 4.6 --- test/specificClass.test.js | 263 +++++++++++++++++++++++++++++++++++++ 1 file changed, 263 insertions(+) create mode 100644 test/specificClass.test.js diff --git a/test/specificClass.test.js b/test/specificClass.test.js new file mode 100644 index 0000000..83e3e72 --- /dev/null +++ b/test/specificClass.test.js @@ -0,0 +1,263 @@ +/** + * Tests for settler specificClass (domain logic). + * + * The Settler class is a simple mass-balance separator: + * - Splits influent into effluent (clarified), surplus sludge, and return sludge + * - Concentrates particulate species (indices 7-12) into sludge stream + * - Removes particulates from effluent stream + * - registerChild: connects measurements, upstream reactors, machines + */ + +const { Settler } = require('../src/specificClass'); + +// --------------- helpers --------------- + +const NUM_SPECIES = 13; + +function makeConfig(overrides = {}) { + return { + general: { + name: 'TestSettler', + id: 'settler-test-1', + logging: { enabled: false, logLevel: 'error' }, + }, + functionality: { + softwareType: 'settler', + role: 'separator', + positionVsParent: 'downstream', + }, + ...overrides, + }; +} + +// --------------- tests --------------- + +describe('Settler specificClass', () => { + + describe('constructor / initialization', () => { + it('should create an instance with default values', () => { + const s = new Settler(makeConfig()); + expect(s).toBeDefined(); + expect(s.F_in).toBe(0); + expect(s.Cs_in).toEqual(new Array(NUM_SPECIES).fill(0)); + expect(s.C_TS).toBe(2500); + }); + + it('should have null upstreamReactor and returnPump initially', () => { + const s = new Settler(makeConfig()); + expect(s.upstreamReactor).toBeNull(); + expect(s.returnPump).toBeNull(); + }); + + it('should initialize an EventEmitter', () => { + const s = new Settler(makeConfig()); + expect(s.emitter).toBeDefined(); + expect(typeof s.emitter.on).toBe('function'); + }); + + it('should initialize a MeasurementContainer', () => { + const s = new Settler(makeConfig()); + expect(s.measurements).toBeDefined(); + }); + }); + + describe('getEffluent', () => { + + describe('with zero inflow', () => { + it('should return three streams with zero flows', () => { + const s = new Settler(makeConfig()); + s.F_in = 0; + s.Cs_in = new Array(NUM_SPECIES).fill(0); + const result = s.getEffluent; + expect(result).toHaveLength(3); + expect(result[0].payload.F).toBe(0); // effluent + expect(result[1].payload.F).toBe(0); // surplus sludge + expect(result[2].payload.F).toBe(0); // return sludge + }); + }); + + describe('with normal inflow and particulates', () => { + let s; + let result; + + beforeAll(() => { + s = new Settler(makeConfig()); + s.F_in = 100; + s.C_TS = 5000; + // Set concentrations: solubles at indices 0-6, particulates at 7-12 + const C = new Array(NUM_SPECIES).fill(10); + C[12] = 5000; // X_TS + s.Cs_in = C; + result = s.getEffluent; + }); + + it('should return 3 output streams', () => { + expect(result).toHaveLength(3); + }); + + it('should have effluent topic "Fluent"', () => { + expect(result[0].topic).toBe('Fluent'); + }); + + it('should calculate sludge flow F_s = min(F_in * X_TS_in / C_TS, F_in)', () => { + // F_s = min(100 * 5000 / 5000, 100) = min(100, 100) = 100 + const F_eff = result[0].payload.F; + const F_so = result[1].payload.F; + const F_sr = result[2].payload.F; + // Total out should equal F_in (mass balance) + expect(F_eff + F_so + F_sr).toBeCloseTo(100, 5); + }); + + it('should set effluent particulate indices to zero when F_s > 0', () => { + const Cs_eff = result[0].payload.C; + for (let i = 7; i <= 12; i++) { + expect(Cs_eff[i]).toBe(0); + } + }); + + it('should keep effluent soluble indices unchanged', () => { + const Cs_eff = result[0].payload.C; + for (let i = 0; i < 7; i++) { + expect(Cs_eff[i]).toBe(10); + } + }); + + it('should concentrate particulates in sludge stream', () => { + const Cs_s = result[1].payload.C; + const F_s = Math.min((s.F_in * s.Cs_in[12]) / s.C_TS, s.F_in); + // Cs_s[i] = F_in * Cs_in[i] / F_s for particulate indices + for (let i = 7; i <= 12; i++) { + const expected = s.F_in * s.Cs_in[i] / F_s; + expect(Cs_s[i]).toBeCloseTo(expected, 5); + } + }); + }); + + describe('with low X_TS and high C_TS (dilute sludge)', () => { + it('should produce mostly effluent flow', () => { + const s = new Settler(makeConfig()); + s.F_in = 100; + s.C_TS = 10000; // high target concentration + const C = new Array(NUM_SPECIES).fill(10); + C[12] = 100; // low X_TS in + s.Cs_in = C; + const result = s.getEffluent; + // F_s = min(100 * 100 / 10000, 100) = min(1, 100) = 1 + expect(result[0].payload.F).toBeCloseTo(99, 5); // most flow is effluent + }); + }); + + describe('mass balance', () => { + it('should conserve total flow (F_eff + F_so + F_sr = F_in)', () => { + const s = new Settler(makeConfig()); + s.F_in = 200; + s.C_TS = 3000; + const C = new Array(NUM_SPECIES).fill(5); + C[12] = 2000; + s.Cs_in = C; + const result = s.getEffluent; + const totalOut = result[0].payload.F + result[1].payload.F + result[2].payload.F; + expect(totalOut).toBeCloseTo(200, 5); + }); + + it('should not produce negative flows', () => { + const s = new Settler(makeConfig()); + s.F_in = 50; + s.C_TS = 1000; + const C = new Array(NUM_SPECIES).fill(0); + C[12] = 500; + s.Cs_in = C; + const result = s.getEffluent; + result.forEach(stream => { + expect(stream.payload.F).toBeGreaterThanOrEqual(0); + }); + }); + }); + + describe('no return pump', () => { + it('should have F_sr = 0 when there is no return pump', () => { + const s = new Settler(makeConfig()); + s.F_in = 100; + s.C_TS = 5000; + s.Cs_in = new Array(NUM_SPECIES).fill(10); + s.Cs_in[12] = 3000; + const result = s.getEffluent; + expect(result[2].payload.F).toBe(0); + }); + }); + + describe('edge case: X_TS > C_TS (F_s clamped to F_in)', () => { + it('should clamp F_s to F_in when X_TS/C_TS ratio exceeds 1', () => { + const s = new Settler(makeConfig()); + s.F_in = 100; + s.C_TS = 1000; + s.Cs_in = new Array(NUM_SPECIES).fill(10); + s.Cs_in[12] = 5000; // X_TS_in > C_TS => F_s = min(500, 100) = 100 + const result = s.getEffluent; + expect(result[0].payload.F).toBe(0); // all flow goes to sludge + }); + }); + }); + + describe('registerChild()', () => { + it('should not throw for null child', () => { + const s = new Settler(makeConfig()); + // null child should trigger the error log but not crash + expect(() => s.registerChild(null, 'measurement')).not.toThrow(); + }); + + it('should not throw for unknown software type with valid child', () => { + const s = new Settler(makeConfig()); + const fakeChild = { + config: { + general: { name: 'fake', id: 'fake-1' }, + functionality: { positionVsParent: 'upstream' }, + asset: { type: 'pressure' }, + }, + measurements: { emitter: { on: jest.fn() } }, + }; + expect(() => s.registerChild(fakeChild, 'unknownType')).not.toThrow(); + }); + }); + + describe('_connectMachine()', () => { + it('should set returnPump for downstream machine', () => { + const s = new Settler(makeConfig()); + const fakeMachine = { + config: { + general: { name: 'pump', id: 'pump-1' }, + functionality: { positionVsParent: 'downstream' }, + }, + }; + s._connectMachine(fakeMachine); + expect(s.returnPump).toBe(fakeMachine); + expect(fakeMachine.upstreamSource).toBe(s); + }); + + it('should not set returnPump for non-downstream machine', () => { + const s = new Settler(makeConfig()); + const fakeMachine = { + config: { + general: { name: 'pump', id: 'pump-2' }, + functionality: { positionVsParent: 'upstream' }, + }, + }; + s._connectMachine(fakeMachine); + expect(s.returnPump).toBeNull(); + }); + }); + + describe('_updateMeasurement()', () => { + it('should update C_TS when measurement type is "quantity (tss)"', () => { + const s = new Settler(makeConfig()); + s._updateMeasurement('quantity (tss)', 7000, 'atEquipment', {}); + expect(s.C_TS).toBe(7000); + }); + + it('should not change C_TS for unrecognized measurement type', () => { + const s = new Settler(makeConfig()); + s._updateMeasurement('temperature', 25, 'atEquipment', {}); + expect(s.C_TS).toBe(2500); // unchanged + }); + }); +}); From fdfb9edf0d1ae9fce634db4e262243d81637af87 Mon Sep 17 00:00:00 2001 From: Rene De Ren Date: Thu, 12 Mar 2026 09:33:31 +0100 Subject: [PATCH 5/6] fix: replace console.log with logger for unknown topic warning Co-Authored-By: Claude Opus 4.6 --- src/nodeClass.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nodeClass.js b/src/nodeClass.js index 92536fd..ae85d83 100644 --- a/src/nodeClass.js +++ b/src/nodeClass.js @@ -41,7 +41,7 @@ class nodeClass { break; } default: - console.log("Unknown topic: " + msg.topic); + this.source.logger.warn(`Unknown topic: ${msg.topic}`); } if (done) { From a650ca4856a8524765977386e12ce0a5297d5c91 Mon Sep 17 00:00:00 2001 From: Rene De Ren Date: Thu, 12 Mar 2026 16:39:25 +0100 Subject: [PATCH 6/6] Expose output format selectors in editor --- settler.html | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/settler.html b/settler.html index 5ca254f..703a588 100644 --- a/settler.html +++ b/settler.html @@ -6,6 +6,8 @@ color: "#e4a363", defaults: { name: { value: "" }, + processOutputFormat: { value: "process" }, + dbaseOutputFormat: { value: "influxdb" }, enableLog: { value: false }, logLevel: { value: "error" }, @@ -55,6 +57,24 @@ +

Output Formats

+
+ + +
+
+ + +
+
@@ -65,4 +85,4 @@ \ No newline at end of file +