From d1385e48c40ba0ebfd6532110a3cd9551aaf9d1f Mon Sep 17 00:00:00 2001 From: Dave Wickelhaus Date: Sun, 23 Nov 2025 21:41:55 -0500 Subject: [PATCH] On branch main_websocket_fixes_3 Changes to be committed: modified: src/mtconnect/sink/rest_sink/rest_service.cpp - RestService::createAssetRoutings - added asset, assets commands to the handler routings - added assetsById command to to the idHandler routings - RestService::createSampleRoutings - added code to set the request->parameter("count") parameter to 100 if it's not instantiated. --- src/mtconnect/sink/rest_sink/rest_service.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/mtconnect/sink/rest_sink/rest_service.cpp b/src/mtconnect/sink/rest_sink/rest_service.cpp index 1f01a8445..d550ed06e 100644 --- a/src/mtconnect/sink/rest_sink/rest_service.cpp +++ b/src/mtconnect/sink/rest_sink/rest_service.cpp @@ -569,12 +569,14 @@ namespace mtconnect { "count={integer:100}&device={string}&pretty={bool:false}&format={string}"); m_server->addRouting({boost::beast::http::verb::get, "/assets?" + qp, handler}) .document("MTConnect assets request", "Returns up to `count` assets"); + m_server->addRouting({boost::beast::http::verb::get, "/{device}/assets?" + qp, handler}) + .document("MTConnect assets request", "Returns up to `count` assets for deivce `device`") + .command("assets"); m_server->addRouting({boost::beast::http::verb::get, "/asset?" + qp, handler}) .document("MTConnect asset request", "Returns up to `count` assets"); - m_server->addRouting({boost::beast::http::verb::get, "/{device}/assets?" + qp, handler}) - .document("MTConnect assets request", "Returns up to `count` assets for deivce `device`"); m_server->addRouting({boost::beast::http::verb::get, "/{device}/asset?" + qp, handler}) - .document("MTConnect asset request", "Returns up to `count` assets for deivce `device`"); + .document("MTConnect asset request", "Returns up to `count` assets for deivce `device`") + .command("asset"); m_server->addRouting({boost::beast::http::verb::get, "/assets/{assetIds}", idHandler}) .document( "MTConnect assets request", @@ -582,7 +584,8 @@ namespace mtconnect { m_server->addRouting({boost::beast::http::verb::get, "/asset/{assetIds}", idHandler}) .document("MTConnect asset request", "Returns a set of assets identified by asset ids `asset` separated by " - "semi-colon (;)"); + "semi-colon (;)") + .command("assetsById"); if (m_server->arePutsAllowed()) { @@ -727,9 +730,13 @@ namespace mtconnect { void RestService::createSampleRoutings() { using namespace rest_sink; + + auto handler = [&](SessionPtr session, RequestPtr request) -> bool { request->m_request = "MTConnectStreams"; + if(!request->parameter("count")) request->m_parameters["count"] =100; + auto interval = request->parameter("interval"); if (interval) {