From 0a3a0be15bab24c4d03180c66146451e9bfec57b Mon Sep 17 00:00:00 2001 From: znetsixe Date: Fri, 29 May 2026 18:41:14 +0200 Subject: [PATCH] =?UTF-8?q?feat(commands):=20adopt=20unified=20command=20e?= =?UTF-8?q?nvelope=20=E2=80=94=20msg.origin=20+=20unit=20shorthand?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Provenance resolved via msg.origin (registry-stamped, default parent) with a legacy fallback to payload.source; feeds handleInput's mode/source gating. - set.flow-setpoint: units:{measure,default} -> unit:'m3/h' shorthand. 181/181 tests green. Co-Authored-By: Claude Opus 4.8 (1M context) --- src/commands/handlers.js | 20 +++++++++++++++----- src/commands/index.js | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/commands/handlers.js b/src/commands/handlers.js index 5b1079d..57457ad 100644 --- a/src/commands/handlers.js +++ b/src/commands/handlers.js @@ -16,6 +16,16 @@ function _logger(source, ctx) { return ctx?.logger || source?.logger || null; } +// Resolve the command origin (control authority: parent | GUI | fysical). +// The shared commandRegistry stamps msg.origin (default 'parent'); legacy flows +// carried the origin as payload.source. Prefer the legacy field when present so +// existing flows keep working, otherwise use the registry-stamped msg.origin. +function _origin(msg) { + const p = msg && msg.payload; + if (p && typeof p === 'object' && typeof p.source === 'string' && p.source) return p.source; + return (typeof msg?.origin === 'string' && msg.origin) ? msg.origin : 'parent'; +} + function _send(ctx, ports) { if (typeof ctx?.send === 'function') ctx.send(ports); } @@ -28,19 +38,19 @@ exports.setMode = (source, msg) => { // forwards to these directly so behaviour is identical. exports.startup = async (source, msg) => { const p = msg.payload || {}; - await source.handleInput(p.source ?? 'parent', 'execSequence', 'startup'); + await source.handleInput(_origin(msg), 'execSequence', 'startup'); }; exports.shutdown = async (source, msg) => { const p = msg.payload || {}; - await source.handleInput(p.source ?? 'parent', 'execSequence', 'shutdown'); + await source.handleInput(_origin(msg), 'execSequence', 'shutdown'); }; exports.estop = async (source, msg) => { const p = msg.payload || {}; // Legacy emergencystop carried { source, action } — action defaults to // 'emergencystop' when only source is supplied via the canonical topic. - await source.handleInput(p.source ?? 'parent', p.action ?? 'emergencystop'); + await source.handleInput(_origin(msg), p.action ?? 'emergencystop'); }; // Content-based alias router: legacy `execSequence` carried payload.action in @@ -57,13 +67,13 @@ exports.execSequenceAlias = async (source, msg, ctx) => { exports.setSetpoint = async (source, msg) => { const p = msg.payload || {}; const action = p.action ?? 'execMovement'; - await source.handleInput(p.source ?? 'parent', action, Number(p.setpoint)); + await source.handleInput(_origin(msg), action, Number(p.setpoint)); }; exports.setFlowSetpoint = async (source, msg) => { const p = msg.payload || {}; const action = p.action ?? 'flowMovement'; - await source.handleInput(p.source ?? 'parent', action, Number(p.setpoint)); + await source.handleInput(_origin(msg), action, Number(p.setpoint)); }; exports.simulateMeasurement = (source, msg, ctx) => { diff --git a/src/commands/index.js b/src/commands/index.js index 483d3b3..75a2fd3 100644 --- a/src/commands/index.js +++ b/src/commands/index.js @@ -63,7 +63,7 @@ module.exports = [ topic: 'set.flow-setpoint', aliases: ['flowMovement'], payloadSchema: { type: 'object' }, - units: { measure: 'volumeFlowRate', default: 'm3/h' }, + unit: 'm3/h', description: 'Move the machine to a flow setpoint via flowMovement.', handler: handlers.setFlowSetpoint, },