update

examples/README.md

@@ -0,0 +1,8 @@
+# machineGroupControl Example Flows
+
+Import-ready Node-RED examples for machineGroupControl.
+
+## Files
+- basic.flow.json
+- integration.flow.json
+- edge.flow.json

examples/basic.flow.json

@@ -0,0 +1,6 @@
+[
+  {"id":"machineGroupControl_basic_tab","type":"tab","label":"machineGroupControl basic","disabled":false,"info":"machineGroupControl basic example"},
+  {"id":"machineGroupControl_basic_node","type":"machineGroupControl","z":"machineGroupControl_basic_tab","name":"machineGroupControl basic","x":420,"y":180,"wires":[["machineGroupControl_basic_dbg"]]},
+  {"id":"machineGroupControl_basic_inj","type":"inject","z":"machineGroupControl_basic_tab","name":"basic trigger","props":[{"p":"topic","vt":"str"},{"p":"payload","vt":"str"}],"topic":"ping","payload":"1","payloadType":"str","x":160,"y":180,"wires":[["machineGroupControl_basic_node"]]},
+  {"id":"machineGroupControl_basic_dbg","type":"debug","z":"machineGroupControl_basic_tab","name":"machineGroupControl basic debug","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","x":660,"y":180,"wires":[]}
+]

examples/edge.flow.json

@@ -0,0 +1,6 @@
+[
+  {"id":"machineGroupControl_edge_tab","type":"tab","label":"machineGroupControl edge","disabled":false,"info":"machineGroupControl edge example"},
+  {"id":"machineGroupControl_edge_node","type":"machineGroupControl","z":"machineGroupControl_edge_tab","name":"machineGroupControl edge","x":420,"y":180,"wires":[["machineGroupControl_edge_dbg"]]},
+  {"id":"machineGroupControl_edge_inj","type":"inject","z":"machineGroupControl_edge_tab","name":"unknown topic","props":[{"p":"topic","vt":"str"},{"p":"payload","vt":"str"}],"topic":"doesNotExist","payload":"x","payloadType":"str","x":170,"y":180,"wires":[["machineGroupControl_edge_node"]]},
+  {"id":"machineGroupControl_edge_dbg","type":"debug","z":"machineGroupControl_edge_tab","name":"machineGroupControl edge debug","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","x":660,"y":180,"wires":[]}
+]

examples/integration.flow.json

@@ -0,0 +1,6 @@
+[
+  {"id":"machineGroupControl_int_tab","type":"tab","label":"machineGroupControl integration","disabled":false,"info":"machineGroupControl integration example"},
+  {"id":"machineGroupControl_int_node","type":"machineGroupControl","z":"machineGroupControl_int_tab","name":"machineGroupControl integration","x":420,"y":180,"wires":[["machineGroupControl_int_dbg"]]},
+  {"id":"machineGroupControl_int_inj","type":"inject","z":"machineGroupControl_int_tab","name":"registerChild","props":[{"p":"topic","vt":"str"},{"p":"payload","vt":"str"}],"topic":"registerChild","payload":"example-child-id","payloadType":"str","x":170,"y":180,"wires":[["machineGroupControl_int_node"]]},
+  {"id":"machineGroupControl_int_dbg","type":"debug","z":"machineGroupControl_int_tab","name":"machineGroupControl integration debug","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","x":680,"y":180,"wires":[]}
+]

package.json

@@ -4,7 +4,7 @@
   "description": "Control module machineGroupControl",
   "main": "mgc.js",
   "scripts": {
-    "test": "node mgc.js"
+    "test": "node --test test/basic/*.test.js test/integration/*.test.js test/edge/*.test.js"
   },
   "repository": {
     "type": "git",
@@ -24,4 +24,4 @@
       "machineGroupControl": "mgc.js"
     }
   }
-}
+}

src/nodeClass.js

@@ -80,7 +80,7 @@ class nodeClass {
     const availableMachines = Object.values(mg.machines || {}).filter((machine) => {
       // Safety check: ensure machine and machine.state exist
       if (!machine || !machine.state || typeof machine.state.getCurrentState !== 'function') {
-        console.warn(`Machine missing or invalid:`, machine?.config?.general?.id || 'unknown');
+        mg.logger?.warn(`Machine missing or invalid: ${machine?.config?.general?.id || 'unknown'}`);
         return false;
       }
       
@@ -195,67 +195,52 @@ class nodeClass {
     this.node.on(
       "input",
       async (msg, send, done) => {
-            const mg = this.source;
-            const RED = this.RED;
+        const mg = this.source;
+        const RED = this.RED;
+        try {
           switch (msg.topic) {
-            case "registerChild":
-                    //console.log(`Registering child in mgc: ${msg.payload}`);
-                    const childId = msg.payload;
-                    const childObj = RED.nodes.getNode(childId);
-                    
-                    // Debug: Check what we're getting
-                    //console.log(`Child object:`, childObj ? 'found' : 'NOT FOUND');
-                    //console.log(`Child source:`, childObj?.source ? 'exists' : 'MISSING');
-                    if (childObj?.source) {
-                      //console.log(`Child source type:`, childObj.source.constructor.name);
-                      //console.log(`Child has state:`, !!childObj.source.state);
-                    }
-                    
-                    mg.childRegistrationUtils.registerChild(
-                      childObj.source,
-                      msg.positionVsParent
-                    );
-                    
-                    // Debug: Check machines after registration
-                    //console.log(`Total machines after registration:`, Object.keys(mg.machines || {}).length);
-                    break;
-
+            case "registerChild": {
+              const childId = msg.payload;
+              const childObj = RED.nodes.getNode(childId);
+              if (!childObj || !childObj.source) {
+                mg.logger.warn(`registerChild skipped: missing child/source for id=${childId}`);
+                break;
+              }
+              mg.childRegistrationUtils.registerChild(childObj.source, msg.positionVsParent);
+              break;
+            }
             case "setMode":
-              const mode = msg.payload;
-              mg.setMode(mode);
+              mg.setMode(msg.payload);
               break;
-
             case "setScaling":
-              const scaling = msg.payload;
-              mg.setScaling(scaling);
-
+              mg.setScaling(msg.payload);
               break;
-
-            case "Qd":
+            case "Qd": {
               const Qd = parseFloat(msg.payload);
               const sourceQd = "parent";
-
               if (isNaN(Qd)) {
-                return mg.logger.error(`Invalid demand value: ${Qd}`);
+                mg.logger.error(`Invalid demand value: ${msg.payload}`);
+                break;
               }
-
               try {
                 await mg.handleInput(sourceQd, Qd);
                 msg.topic = mg.config.general.name;
                 msg.payload = "done";
                 send(msg);
-              } catch (e) {
-                console.log(e);
+              } catch (error) {
+                mg.logger.error(`Failed to process Qd: ${error.message}`);
               }
               break;
-
+            }
             default:
-              // Handle unknown topics if needed
               mg.logger.warn(`Unknown topic: ${msg.topic}`);
               break;
           }
-          done();
+        } catch (error) {
+          mg.logger.error(`Input handler failure: ${error.message}`);
         }
+        if (typeof done === 'function') done();
+      }
     );
   }
 
@@ -266,7 +251,7 @@ class nodeClass {
     this.node.on("close", (done) => {
       clearInterval(this._tickInterval);
       clearInterval(this._statusInterval);
-      done();
+      if (typeof done === 'function') done();
     });
   }
 }

src/specificClass.js

@@ -2,6 +2,10 @@
 const EventEmitter = require("events");
 const {logger,configUtils,configManager, MeasurementContainer, interpolation , childRegistrationUtils} = require('generalFunctions');
 
+/**
+ * Machine group controller domain model.
+ * Aggregates multiple rotating machines and coordinates group-level optimization/control.
+ */
 class MachineGroup {
     constructor(machineGroupConfig = {}) {
 
@@ -50,7 +54,8 @@ class MachineGroup {
     registerChild(child,softwareType) {
         this.logger.debug('Setting up childs specific for this class');
 
-        const position = child.config.general.positionVsParent;
+        // Prefer functionality-scoped position metadata; keep general fallback for legacy nodes.
+        const position = child.config?.functionality?.positionVsParent || child.config?.general?.positionVsParent;
         
        if(softwareType == "machine"){
            // Check if the machine is already registered
@@ -1396,6 +1401,8 @@ async function makeMachines(){
 }
 
 
-makeMachines();
+if (require.main === module) {
+  makeMachines();
+}
 
 //*/

test/README.md

@@ -0,0 +1,12 @@
+# machineGroupControl Test Suite Layout
+
+Required EVOLV layout:
+- basic/
+- integration/
+- edge/
+- helpers/
+
+Baseline structure tests:
+- basic/structure-module-load.basic.test.js
+- integration/structure-examples.integration.test.js
+- edge/structure-examples-node-type.edge.test.js

test/basic/structure-module-load.basic.test.js

@@ -0,0 +1,8 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+
+test('machineGroupControl module load smoke', () => {
+  assert.doesNotThrow(() => {
+    require('../../mgc.js');
+  });
+});

test/edge/structure-examples-node-type.edge.test.js

@@ -0,0 +1,11 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const path = require('node:path');
+
+const flow = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../examples/basic.flow.json'), 'utf8'));
+
+test('basic example includes node type machineGroupControl', () => {
+  const count = flow.filter((n) => n && n.type === 'machineGroupControl').length;
+  assert.equal(count >= 1, true);
+});

test/integration/structure-examples.integration.test.js

@@ -0,0 +1,23 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const path = require('node:path');
+
+const dir = path.resolve(__dirname, '../../examples');
+
+function loadJson(file) {
+  return JSON.parse(fs.readFileSync(path.join(dir, file), 'utf8'));
+}
+
+test('examples package exists for machineGroupControl', () => {
+  for (const file of ['README.md', 'basic.flow.json', 'integration.flow.json', 'edge.flow.json']) {
+    assert.equal(fs.existsSync(path.join(dir, file)), true, file + ' missing');
+  }
+});
+
+test('example flows are parseable arrays for machineGroupControl', () => {
+  for (const file of ['basic.flow.json', 'integration.flow.json', 'edge.flow.json']) {
+    const parsed = loadJson(file);
+    assert.equal(Array.isArray(parsed), true);
+  }
+});