2 Commits

Author	SHA1	Message	Date
raphael	65db38d9f2	100%/B: S9F3/F5/F11 emission + Router fallback ... Closes the S9 stream. Every documented protocol-error condition is now auto-emitted by Connection (with the assist of one Router predicate), without involving the application. Router (include/secsgem/gem/router.hpp) Adds two predicates: has_handler(stream, function) and has_handler_for_stream(stream). Lets the wrapping message handler decide whether an unhandled message is "unknown stream" (S9F3) or "unknown function in a known stream" (S9F5). Connection (include/secsgem/hsms/{connection.hpp, connection.cpp}) - emit_s9() goes public so the message_handler can call it. - New current_header() accessor returns the HSMS header of the primary currently being dispatched. Non-null only inside the on_message_ call; cleared on the way out. - handle_data sets current_header_ before invoking on_message_. - on_length on oversized frame: synthesizes a 10-byte MHEAD whose first 4 bytes are the offending length prefix, emits S9F11, and sets close_after_flush so the S9F11 goes out before the socket closes. Server (apps/secs_server.cpp) The conn->set_message_handler lambda now wraps router.dispatch. For any inbound primary without a registered handler, it captures the MHEAD via current_header() and emits either S9F3 (stream unknown) or S9F5 (function unknown). The wrapper still returns the Router's reply (SxF0 for primaries with W) so transactional semantics are preserved. COMPLIANCE.md Error Messages row flips from 🟡 to ✅. S9F3/F5/F11 rows in the coverage matrix flip from 🟡 to ✅. Each row in the matrix now states its trigger condition explicitly. Drops the "Finish S9 wiring" bullet from the "what would 100% take" list. Verified - Tests: 78 cases / 454 assertions still pass (no behavioural change on the happy path; new emission paths fire only on protocol errors that the demo doesn't induce). - Build clean. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-06-07 01:57:35 +02:00
raphael	b871cd9da2	Table/YAML-driven refactor (Layer 1 start) ... Move equipment capabilities and the E30 control state machine out of C++ code and into YAML data files; introduce a Router for SECS dispatch; consolidate small files. Behavioural changes: none. Demo identical (15 SxFy transactions + 3 equipment-initiated primaries), 67 test cases / 384 assertions still all green. Structural changes only. Why --- The previous server.cpp held the equipment data dictionary (3 SVIDs, 2 ECIDs, 3 CEIDs, 2 alarms, 2 recipes, 4 host commands) as imperative C++ in a 50-line `populate()` function, and routed inbound messages through a 150-line if-ladder. Adding a new SVID required a recompile. Adding a new state transition required editing two switch statements (`operator_*` and `on_host_request_*`). The control state machine's behavioural rules were spread across imperative code in two methods. This is exactly what implementation_plan.md calls out as the wrong shape: behavioural rules should live in versioned data, and every runtime/test/analyzer should read from that data rather than re-encode it. This commit starts that move. What's new ---------- data/equipment.yaml Equipment data dictionary. Declarative SVIDs / ECIDs / CEIDs / alarms / recipes / host commands. Host commands carry their HCACK ack code plus optional `emit_ceid` and `set_alarm` side-effects. Adding a new SVID or command is a YAML edit, no recompile. data/control_state.yaml The E30 §6.2 control state transition table as data. Each row is (from, on) -> (to [, then] [, ack]). `then` chains an auto-advance through the transient AttemptOnline state. The previous imperative switch is gone. include/secsgem/config/loader.hpp + src/config/loader.cpp yaml-cpp-backed loader. `load_control_state(path)` returns a ControlTransitionTable + initial state; `load_equipment(path, model)` populates the EquipmentDataModel and returns the device descriptor (id, MDLN, SOFTREV, optional auto-emit CEID). Surfaces config errors with file path + field name via ConfigError. include/secsgem/gem/router.hpp (header-only) Small (stream, function) -> handler map. Server registers all handlers once at startup, then the Connection's message handler is just `router.dispatch(msg)`. Unhandled primaries with W set get SxF0 by default. Replaces the if-ladder in secs_server.cpp. include/secsgem/gem/control_state.hpp + .cpp ControlTransitionTable is the new pure data type. ControlStateMachine is now a thin engine over the table: `fire(event)` looks up the row, optionally transitions, optionally chains a `then` transition, returns the ack code. Behaviour rules no longer live in C++ switches. The default in-code table matches data/control_state.yaml row for row; tests rely on it so they don't need the YAML file. include/secsgem/gem/data_model.hpp + .cpp `register_command(rcmd, CommandSpec)` replaces the function-handler signature. CommandSpec = (HostCmdAck, optional emit_ceid, optional set_alarm). `dispatch_command` returns a CommandResult so the server can fire the side-effects after S2F42 is sent. apps/secs_server.cpp No populate(), no if-ladder. Loads equipment.yaml + control_state.yaml at startup (clean error on bad config), wires the Router once, delegates dispatch. Sm change handler reads emit_on_control_change from the YAML. Welcome S10F3 removed for parity with config (a future YAML rule could re-introduce it declaratively). tests/test_loader.cpp (new) Verifies the YAML loader produces the same shape as the in-code default table, and that equipment.yaml populates every section (SVIDs/ECIDs/CEIDs/alarms/recipes/commands). SECSGEM_DATA_DIR CMake define points at ${CMAKE_SOURCE_DIR}/data so tests don't depend on cwd. CMakeLists.txt, Dockerfile find_package(yaml-cpp) and link. libyaml-cpp-dev added to the Ubuntu base image (yaml-cpp 0.8 ships the modern target name). File consolidation ------------------ Five small files removed; their content lives in fewer headers: - secs2/item.cpp -> inline in secs2/item.hpp - secs2/message.cpp -> inline in secs2/message.hpp - hsms/types.hpp -> merged into hsms/header.hpp - hsms/frame.hpp -> merged into hsms/header.hpp - hsms/frame.cpp -> merged into hsms/header.cpp hsms/header.hpp is now "the HSMS wire format" in one place: SType + status enums + Timers + Header + Frame + constants. All includers updated. Net effect ---------- Before: equipment data dictionary lived in 50 lines of imperative populate() inside secs_server.cpp; dispatch in a 20-branch if-ladder. After: equipment data dictionary lives in 47 lines of YAML; dispatch is a Router built once. Adding a new capability is now a YAML edit in the common case. Test count up to 67 cases / 384 assertions (+4 cases / +106 assertions) covering the loader and the new table-driven SM paths. What's NOT changed ------------------ The per-SxFy reply construction still lives in C++ (each message has a unique body shape). Moving those into YAML/JSON message-shape definitions is the next refactor step but requires a generic typed encoder/decoder driven by shape descriptors; out of scope here. Spooling, the S9 error stream, S1F19/F20, and the other gaps in COMPLIANCE.md remain unchanged. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-06-02 08:57:38 +02:00