Skip to content

Main websocket fixes 3 #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dwickelhaus wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Main websocket fixes 3 #586

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1385e4
On branch main_websocket_fixes_3
dwickelhaus Nov 24, 2025
20e7531
Merge branch 'main' into main_websocket_fixes_3
dwickelhaus Dec 5, 2025
f231914
Merge branch 'main' into main_websocket_fixes_3
dwickelhaus Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/mtconnect/sink/rest_sink/rest_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,20 +569,23 @@ 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",
"Returns a set assets identified by asset ids `asset` separated by semi-colon (;)");
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())
{
Expand Down Expand Up @@ -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<int32_t>("count")) request->m_parameters["count"] =100;

auto interval = request->parameter<int32_t>("interval");
if (interval)
{
Expand Down