engine: Make probe output trigger schema

Author: cassava

engine/src/coordinator.cpp

@@ -82,20 +82,18 @@ std::shared_ptr<cloe::TriggerRegistrar> Coordinator::trigger_registrar(Source s)
   return std::make_shared<TriggerRegistrar>(*this, s);
 }
 
-[[nodiscard]] std::vector<std::string> Coordinator::trigger_action_names() const {
-  std::vector<std::string> results;
-  results.reserve(actions_.size());
-  for (const auto& [key, _] : actions_) {
-    results.emplace_back(key);
+[[nodiscard]] std::map<std::string, fable::Json> Coordinator::trigger_action_schemas() const {
+  std::map<std::string, fable::Json> results;
+  for (const auto& [key, ptr] : actions_) {
+    results.emplace(key, ptr->schema().json_schema());
   }
   return results;
 }
 
-[[nodiscard]] std::vector<std::string> Coordinator::trigger_event_names() const {
-  std::vector<std::string> results;
-  results.reserve(events_.size());
-  for (const auto& [key, _] : events_) {
-    results.emplace_back(key);
+[[nodiscard]] std::map<std::string, fable::Json> Coordinator::trigger_event_schemas() const {
+  std::map<std::string, fable::Json> results;
+  for (const auto& [key, ptr] : events_) {
+    results.emplace(key, ptr->schema().json_schema());
   }
   return results;
 }

engine/src/coordinator.hpp

@@ -22,19 +22,19 @@
 
 #pragma once
 
-#include <list>                // for list<>
-#include <map>                 // for map<>
-#include <memory>              // for unique_ptr<>, shared_ptr<>
-#include <mutex>               // for mutex
-#include <queue>               // for queue<>
-#include <string>              // for string
-#include <vector>              // for vector<>
+#include <list>    // for list<>
+#include <map>     // for map<>
+#include <memory>  // for unique_ptr<>, shared_ptr<>
+#include <mutex>   // for mutex
+#include <queue>   // for queue<>
+#include <string>  // for string
+#include <vector>  // for vector<>
 
 #include <sol/state_view.hpp>  // for state_view
 #include <sol/table.hpp>       // for table
 
-#include <cloe/cloe_fwd.hpp>   // for Registrar, DataBroker
-#include <cloe/trigger.hpp>    // for Trigger, Action, Event, ...
+#include <cloe/cloe_fwd.hpp>  // for Registrar, DataBroker
+#include <cloe/trigger.hpp>   // for Trigger, Action, Event, ...
 
 namespace engine {
 
@@ -49,7 +49,7 @@ class TriggerUnknownAction : public cloe::TriggerInvalid {
  public:
   TriggerUnknownAction(const std::string& key, const cloe::Conf& c)
       : TriggerInvalid(c, "unknown action: " + key), key_(key) {}
-   ~TriggerUnknownAction() noexcept override = default;
+  ~TriggerUnknownAction() noexcept override = default;
 
   /**
    * Return key that is unknown.
@@ -120,12 +120,12 @@ class Coordinator {
   /**
    * Return a list of names of all available actions that have been enrolled.
    */
-  [[nodiscard]] std::vector<std::string> trigger_action_names() const;
+  [[nodiscard]] std::map<std::string, fable::Json> trigger_action_schemas() const;
 
   /**
    * Return a list of names of all available events that have been enrolled.
    */
-  [[nodiscard]] std::vector<std::string> trigger_event_names() const;
+  [[nodiscard]] std::map<std::string, fable::Json> trigger_event_schemas() const;
 
   /**
    * Process any incoming triggers, clear the buffer, and trigger time-based

engine/src/simulation_probe.hpp

@@ -55,10 +55,10 @@ struct SimulationProbe {
   std::map<std::string, std::vector<std::string>> vehicles;
 
   /// List of trigger actions enrolled.
-  std::vector<std::string> trigger_actions;
+  std::map<std::string, fable::Json> trigger_actions;
 
   /// List of trigger events enrolled.
-  std::vector<std::string> trigger_events;
+  std::map<std::string, fable::Json> trigger_events;
 
   /// List of HTTP endpoints that are available.
   std::vector<std::string> http_endpoints;

engine/src/simulation_state_probe.cpp

@@ -69,8 +69,8 @@ StateId SimulationMachine::Probe::impl(SimulationContext& ctx) {
   for (const auto& [name, veh] : ctx.vehicles) {
     data.vehicles[name] = veh->component_names();
   }
-  data.trigger_actions = ctx.coordinator->trigger_action_names();
-  data.trigger_events = ctx.coordinator->trigger_event_names();
+  data.trigger_actions = ctx.coordinator->trigger_action_schemas();
+  data.trigger_events = ctx.coordinator->trigger_event_schemas();
   data.http_endpoints = ctx.server->endpoints();
   data.signal_metadata = dump_signals(*ctx.db);
   data.test_metadata = sol::object(cloe::luat_cloe_engine_state(ctx.lua)["report"]["tests"]);